diff --git a/assets/xml/objects/object_market_obj.xml b/assets/xml/objects/object_market_obj.xml index 81ab838f1f..8ad9436cc0 100644 --- a/assets/xml/objects/object_market_obj.xml +++ b/assets/xml/objects/object_market_obj.xml @@ -1,65 +1,69 @@  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 8ac6c61c39..f2f5ef8703 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -27,17 +27,25 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -Gfx* D_80AF0120[] = { object_market_obj_DL_01F050, object_market_obj_DL_018DA0 }; -Gfx* D_80AF0128[] = { object_market_obj_DL_01EF10, object_market_obj_DL_018C60 }; +Gfx* sMarketDLs[] = { + gWestClockTownMarketDayDL, + gWestClockTownMarketNightDL, +}; + +Gfx* sBankAdvertisementsAndDoorDLs[] = { + gWestClockTownMarketBankAdvertisementsAndDoorDayDL, + gWestClockTownMarketBankAdvertisementsAndDoorNightDL, +}; void BgMarketStep_Init(Actor* thisx, PlayState* play) { BgMarketStep* this = THIS; Actor_ProcessInitChain(&this->actor, sInitChain); } -void BgMarketStep_Draw(Actor* thisx, PlayState* play) { - s32 index = thisx->params & 1; - Gfx_DrawDListOpa(play, D_80AF0120[index]); - Gfx_DrawDListOpa(play, D_80AF0128[index]); +void BgMarketStep_Draw(Actor* thisx, PlayState* play) { + s32 timeOfDay = BG_MARKET_STEP_GET_TIME_OF_DAY(thisx); + + Gfx_DrawDListOpa(play, sMarketDLs[timeOfDay]); + Gfx_DrawDListOpa(play, sBankAdvertisementsAndDoorDLs[timeOfDay]); } diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h index aa98c0aa1b..c779b227ac 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h @@ -3,6 +3,8 @@ #include "global.h" +#define BG_MARKET_STEP_GET_TIME_OF_DAY(thisx) ((thisx)->params & 1) + struct BgMarketStep; typedef struct BgMarketStep { diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index fa4654705f..538030f581 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -13328,8 +13328,8 @@ 0x80AF0050:("D_80AF0050","UNK_TYPE1","",0x1), 0x80AF00F0:("Bg_Market_Step_InitVars","UNK_TYPE1","",0x1), 0x80AF0110:("D_80AF0110","UNK_TYPE1","",0x1), - 0x80AF0120:("D_80AF0120","UNK_TYPE1","",0x1), - 0x80AF0128:("D_80AF0128","UNK_TYPE1","",0x1), + 0x80AF0120:("sMarketDLs","UNK_TYPE1","",0x1), + 0x80AF0128:("sBankAdvertisementsAndFakeDoorDLs","UNK_TYPE1","",0x1), 0x80AF0720:("Obj_Lupygamelift_InitVars","UNK_TYPE1","",0x1), 0x80AF0740:("D_80AF0740","UNK_TYPE1","",0x1), 0x80AF0750:("D_80AF0750","f32","",0x4),