diff --git a/assets/xml/objects/object_inibs_object.xml b/assets/xml/objects/object_inibs_object.xml index e1d454ae71..db78735fb3 100644 --- a/assets/xml/objects/object_inibs_object.xml +++ b/assets/xml/objects/object_inibs_object.xml @@ -1,35 +1,43 @@  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index bd641bf4c1..68c432c5f4 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -27,9 +27,9 @@ const ActorInit Bg_Inibs_Movebg_InitVars = { (ActorFunc)BgInibsMovebg_Draw, }; -Gfx* D_80B96560[] = { object_inibs_object_DL_0062D8, object_inibs_object_DL_001DC0 }; -Gfx* D_80B96568[] = { object_inibs_object_DL_006140, object_inibs_object_DL_001C10 }; -AnimatedMaterial* D_80B96570[] = { object_inibs_object_Matanimheader_006858, object_inibs_object_Matanimheader_002598 }; +Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL }; +Gfx* sXluDLists[] = { gTwinmoldArenaNormalModeCenterPlatformDL, gTwinmoldArenaGiantModeCenterPlatformDL }; +AnimatedMaterial* sSandTexAnims[] = { gTwinmoldArenaNormalModeSandTexAnim, gTwinmoldArenaGiantModeSandTexAnim }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), @@ -41,9 +41,9 @@ void BgInibsMovebg_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, 1); - this->unk_15C = D_80B96560[BGINIBSMOVEBG_GET_F(thisx)]; - this->unk_160 = D_80B96568[BGINIBSMOVEBG_GET_F(thisx)]; - this->unk_164 = D_80B96570[BGINIBSMOVEBG_GET_F(thisx)]; + this->opaDList = sOpaDLists[BG_INIBS_MOVEBG_GET_MODE(thisx)]; + this->xluDList = sXluDLists[BG_INIBS_MOVEBG_GET_MODE(thisx)]; + this->sandTexAnim = sSandTexAnims[BG_INIBS_MOVEBG_GET_MODE(thisx)]; } void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play) { @@ -54,23 +54,22 @@ void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play) { void BgInibsMovebg_Draw(Actor* thisx, PlayState* play) { BgInibsMovebg* this = THIS; + AnimatedMaterial* sandTexAnim; + Gfx* opaDList; + Gfx* xluDList; - AnimatedMaterial* animMat; - Gfx* dl1; - Gfx* dl2; - - animMat = this->unk_164; - if (animMat != NULL) { - AnimatedMat_Draw(play, Lib_SegmentedToVirtual(this->unk_164)); + sandTexAnim = this->sandTexAnim; + if (sandTexAnim != NULL) { + AnimatedMat_Draw(play, Lib_SegmentedToVirtual(this->sandTexAnim)); } - dl1 = this->unk_15C; - if (dl1 != NULL) { - Gfx_DrawDListOpa(play, this->unk_15C); + opaDList = this->opaDList; + if (opaDList != NULL) { + Gfx_DrawDListOpa(play, this->opaDList); } - dl2 = this->unk_160; - if (dl2 != NULL) { - Gfx_DrawDListXlu(play, this->unk_160); + xluDList = this->xluDList; + if (xluDList != NULL) { + Gfx_DrawDListXlu(play, this->xluDList); } } diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h index 92494a35f9..629a5cd036 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h @@ -5,13 +5,13 @@ struct BgInibsMovebg; -#define BGINIBSMOVEBG_GET_F(thisx) ((u16)((thisx)->params) & 0xF) +#define BG_INIBS_MOVEBG_GET_MODE(thisx) ((u16)((thisx)->params) & 0xF) typedef struct BgInibsMovebg { /* 0x000 */ DynaPolyActor dyna; - /* 0x15C */ Gfx* unk_15C; - /* 0x160 */ Gfx* unk_160; - /* 0x164 */ AnimatedMaterial* unk_164; + /* 0x15C */ Gfx* opaDList; + /* 0x160 */ Gfx* xluDList; + /* 0x164 */ AnimatedMaterial* sandTexAnim; } BgInibsMovebg; // size = 0x168 extern const ActorInit Bg_Inibs_Movebg_InitVars; diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 1f8a8a974d..fa4654705f 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -15288,9 +15288,9 @@ 0x80B96178:("D_80B96178","UNK_TYPE1","",0x1), 0x80B963C0:("Obj_Jg_Gakki_InitVars","UNK_TYPE1","",0x1), 0x80B96540:("Bg_Inibs_Movebg_InitVars","UNK_TYPE1","",0x1), - 0x80B96560:("D_80B96560","UNK_TYPE1","",0x1), - 0x80B96568:("D_80B96568","UNK_TYPE1","",0x1), - 0x80B96570:("D_80B96570","UNK_TYPE1","",0x1), + 0x80B96560:("sOpaDLists","UNK_TYPE1","",0x1), + 0x80B96568:("sXluDLists","UNK_TYPE1","",0x1), + 0x80B96570:("sSandTexAnims","UNK_TYPE1","",0x1), 0x80B96578:("D_80B96578","UNK_TYPE1","",0x1), 0x80B998C0:("En_Zot_InitVars","UNK_TYPE1","",0x1), 0x80B998E0:("D_80B998E0","UNK_TYPE1","",0x1),