falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bg_market_step OK (#21) 

* bg_market_step OK

* Ran formatting script

* Converted arrays to Gfx* arrays and formatted init vars properly

* Propery formed display lists and arrays
This commit is contained in:
fullgrowngaming 2020-09-28 16:26:33 -07:00 committed by GitHub
parent 31a5f1e4ba
commit 378684152c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linker_scripts/code_script.txt
View File

@ -5763,8 +5763,9 @@ SECTIONS
ovl_Bg_Market_Step : AT(RomLocation)
{
build/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.o(.text)
build/asm/ovl_Bg_Market_Step_data.o(.data)
build/asm/ovl_Bg_Market_Step_rodata.o(.rodata)
build/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.o(.data)
build/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.o(.rodata)
build/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;

6
linker_scripts/object_script.txt
View File

@ -26,3 +26,9 @@ D_060011E0 = 0x060011E0;
/* bg_mbar */
D_06000288 = 0x06000288;
D_060019B4 = 0x060019B4;
/* z_bg_market_step */
D_0601F050 = 0x0601F050;
D_06018DA0 = 0x06018DA0;
D_0601EF10 = 0x0601EF10;
D_06018C60 = 0x06018C60;

28
src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
View File

@ -7,7 +7,6 @@
void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMarketStep_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Market_Step_InitVars = {
ACTOR_BG_MARKET_STEP,
ACTORTYPE_BG,
@ -19,8 +18,29 @@ const ActorInit Bg_Market_Step_InitVars = {
(ActorFunc)func_800BDFB0,
(ActorFunc)BgMarketStep_Draw
};
*/
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Market_Step_0x80AF0060/BgMarketStep_Init.asm")
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unkFC, 1, ICHAIN_CONTINUE),
ICHAIN_F32(unk100, 1, ICHAIN_CONTINUE),
ICHAIN_F32(unk104, 1, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Market_Step_0x80AF0060/BgMarketStep_Draw.asm")
extern Gfx D_0601F050[];
extern Gfx D_06018DA0[];
extern Gfx D_0601EF10[];
extern Gfx D_06018C60[];
Gfx* D_80AF0120[] = { D_0601F050, D_06018DA0 };
Gfx* D_80AF0128[] = { D_0601EF10, D_06018C60 };
void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMarketStep* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
}
void BgMarketStep_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 index = thisx->params & 1;
func_800BDFC0(globalCtx, D_80AF0120[index]);
func_800BDFC0(globalCtx, D_80AF0128[index]);
}