PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and link CScriptHUDMemo 

Former-commit-id: 8e0266da21
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-20 02:08:22 +03:00
parent f5ee53caad
commit c292880a94
6 changed files with 89 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s
View File

@ -3,8 +3,8 @@
.section .data
.balign 8
.global lbl_803DFBF0
lbl_803DFBF0:
.global __vt__14CScriptHUDMemo
__vt__14CScriptHUDMemo:
# ROM: 0x3DCBF0
.4byte 0
.4byte 0
@ -160,9 +160,9 @@ __dt__14CScriptHUDMemoFv:
/* 800E84E0 000E5440 93 C1 00 08 */ stw r30, 8(r1)
/* 800E84E4 000E5444 7C 7E 1B 79 */ or. r30, r3, r3
/* 800E84E8 000E5448 41 82 00 60 */ beq lbl_800E8548
/* 800E84EC 000E544C 3C 60 80 3E */ lis r3, lbl_803DFBF0@ha
/* 800E84EC 000E544C 3C 60 80 3E */ lis r3, __vt__14CScriptHUDMemo@ha
/* 800E84F0 000E5450 34 1E 00 44 */ addic. r0, r30, 0x44
/* 800E84F4 000E5454 38 03 FB F0 */ addi r0, r3, lbl_803DFBF0@l
/* 800E84F4 000E5454 38 03 FB F0 */ addi r0, r3, __vt__14CScriptHUDMemo@l
/* 800E84F8 000E5458 90 1E 00 00 */ stw r0, 0(r30)
/* 800E84FC 000E545C 41 82 00 30 */ beq lbl_800E852C
/* 800E8500 000E5460 88 1E 00 50 */ lbz r0, 0x50(r30)
@ -212,9 +212,9 @@ lbl_800E8548:
/* 800E8598 000E54F8 7C 87 23 78 */ mr r7, r4
/* 800E859C 000E54FC 38 81 00 08 */ addi r4, r1, 8
/* 800E85A0 000E5500 4B F6 8D 85 */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
/* 800E85A4 000E5504 3C 60 80 3E */ lis r3, lbl_803DFBF0@ha
/* 800E85A4 000E5504 3C 60 80 3E */ lis r3, __vt__14CScriptHUDMemo@ha
/* 800E85A8 000E5508 3C 1A 00 01 */ addis r0, r26, 1
/* 800E85AC 000E550C 38 63 FB F0 */ addi r3, r3, lbl_803DFBF0@l
/* 800E85AC 000E550C 38 63 FB F0 */ addi r3, r3, __vt__14CScriptHUDMemo@l
/* 800E85B0 000E5510 3B C0 00 00 */ li r30, 0
/* 800E85B4 000E5514 90 7F 00 00 */ stw r3, 0(r31)
/* 800E85B8 000E5518 28 00 FF FF */ cmplwi r0, 0xffff

2
configure.py
View File

@ -137,7 +137,7 @@ LIBS = [
"MetroidPrime/ScriptObjects/CScriptRandomRelay",
"MetroidPrime/Enemies/CBeetle",
["MetroidPrime/HUD/CHUDMemoParms", True],
"MetroidPrime/ScriptObjects/CScriptHUDMemo",
["MetroidPrime/ScriptObjects/CScriptHUDMemo", True],
"MetroidPrime/CMappableObject",
"MetroidPrime/Player/CPlayerCameraBob",
"MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe",

1
include/MetroidPrime/CStateManager.hpp
View File

@ -179,6 +179,7 @@ public:
const CVector3f& knockbackVec);
//
void ShowPausedHUDMemo(CAssetId strg, float time);
void QueueMessage(int frameCount, CAssetId msg, float f1);
int GetHUDMessageFrameCount() const { return xf80_hudMessageFrameCount; }

34
include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp Normal file
View File

@ -0,0 +1,34 @@
#ifndef _CSCRIPTHUDMEMO
#define _CSCRIPTHUDMEMO
#include "MetroidPrime/CEntity.hpp"
#include "MetroidPrime/HUD/CHUDMemoParms.hpp"
#include "rstl/optional_object.hpp"
class CStringTable;
class CScriptHUDMemo : public CEntity {
public:
enum EDisplayType {
kDT_StatusMessage,
kDT_MessageBox,
};
private:
CHUDMemoParms x34_parms;
EDisplayType x3c_dispType;
CAssetId x40_stringTableId;
rstl::optional_object< TLockedToken< CStringTable > > x44_stringTable;
public:
CScriptHUDMemo(TUniqueId, const rstl::string&, const CEntityInfo&, const CHUDMemoParms&,
CScriptHUDMemo::EDisplayType, CAssetId, bool);
~CScriptHUDMemo();
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor) override;
};
CHECK_SIZEOF(CScriptHUDMemo, 0x54)
#endif // _CSCRIPTHUDMEMO

2
obj_files.mk
View File

@ -104,7 +104,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.o\
$(BUILD_DIR)/asm/MetroidPrime/Enemies/CBeetle.o\
$(BUILD_DIR)/src/MetroidPrime/HUD/CHUDMemoParms.o\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.o\
$(BUILD_DIR)/src/MetroidPrime/ScriptObjects/CScriptHUDMemo.o\
$(BUILD_DIR)/asm/MetroidPrime/CMappableObject.o\
$(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerCameraBob.o\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.o\

46
src/MetroidPrime/ScriptObjects/CScriptHUDMemo.cpp Normal file
View File

@ -0,0 +1,46 @@
#include "MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp"
#include "MetroidPrime/HUD/CSamusHud.hpp"
#include "Kyoto/Text/CStringTable.hpp"
CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
const CHUDMemoParms& parms, CScriptHUDMemo::EDisplayType disp,
CAssetId msg, bool active)
: CEntity(uid, info, active, name)
, x34_parms(parms)
, x3c_dispType(disp)
, x40_stringTableId(msg)
, x44_stringTable(msg == kInvalidAssetId ? rstl::optional_object_null()
: rstl::optional_object< TLockedToken< CStringTable > >(
gpSimplePool->GetObj(SObjectTag('STRG', msg)))) {}
CScriptHUDMemo::~CScriptHUDMemo() {}
void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CStateManager& mgr) override {
switch (msg) {
case kSM_SetToZero:
if (GetActive()) {
if (x3c_dispType == kDT_MessageBox) {
mgr.ShowPausedHUDMemo(x40_stringTableId, x34_parms.GetDisplayTime());
} else {
if (x44_stringTable) {
CSamusHud::DisplayHudMemo((*x44_stringTable)->GetString(0), x34_parms);
} else {
CSamusHud::DisplayHudMemo(rstl::wstring_l(L""), x34_parms);
}
}
}
break;
case kSM_Deactivate:
if (GetActive() && x3c_dispType == kDT_StatusMessage) {
CSamusHud::DisplayHudMemo(rstl::wstring_l(L""), CHUDMemoParms(0.f, false, true, false));
}
break;
}
CEntity::AcceptScriptMsg(msg, uid, mgr);
}
void CScriptHUDMemo::Accept(IVisitor& visitor) override { visitor.Visit(*this); }