Misc Stuff 3 (#39)

* cutscene stuff

* fix build issues

* revert accidental change and document random stuff

* document cutscene indices

* make mUnk_0D a bool + disambiguate a reloc

* decomp some itcm functions
This commit is contained in:
Yanis
2026-04-17 02:16:40 +02:00
committed by GitHub
parent ec62ef3392
commit 4a07ec0baa
23 changed files with 1104 additions and 81 deletions
+8 -4
View File
@@ -180,7 +180,7 @@ ARM bool ItemManager::func_ov110_02184a40(ItemId itemId) {
if (temp_r0_5 != 0) {
temp_r0_5 &= 0xFFFF;
SET_FLAG(data_027e09b8->mUnk_14, temp_r0_5);
SET_FLAG(data_027e09b8->mAdventureFlags, temp_r0_5);
}
data_027e0ce0->mUnk_34->func_ov110_02185d3c(itemId);
@@ -669,7 +669,11 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) {
}
if (*(u16 *) this->mUnk_54.mUnk_00 == 0x1000) {
MapObject *pMapObj = gpMapObjManager->func_01fff498(this->mUnk_54.mUnk_00[0], this->mUnk_54.mUnk_00[1]);
UnkStruct_func_01fff498 stack;
stack.ptrIndex = this->mUnk_54.mUnk_00[0];
stack.valueIndex = this->mUnk_54.mUnk_00[1];
MapObject *pMapObj = gpMapObjManager->func_01fff498(stack);
if (pMapObj != NULL) {
var_r5_2 = MapObjectId_None;
@@ -697,9 +701,9 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) {
}
if (this->mUnk_54.mItemId == ItemId_ForestGlyph) {
this->mUnk_72 = data_027e09a4->func_ov000_02070bd0(0x29, 0);
this->mUnk_72 = data_027e09a4->func_ov000_02070bd0(CutsceneIndex_ForestTracksRestoredFromGlyph, 0);
} else if (this->mUnk_54.mItemId == ItemId_FireGlyph) {
this->mUnk_72 = data_027e09a4->func_ov000_02070bd0(0x14, 0);
this->mUnk_72 = data_027e09a4->func_ov000_02070bd0(CutsceneIndex_StavenInTOSAfterFireGlyph_01, 0);
}
if (this->mUnk_72 != 0) {