Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bg_mbar_chair OK (#28)

Browse Source
This commit is contained in:
fullgrowngaming 2020-09-23 17:02:50 -07:00 committed by GitHub
parent 10f9460b3b
commit 79544c9093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/variables_overlay.h
View File

@ -11797,7 +11797,7 @@ extern UNK_TYPE4 D_80B7E664; // D_80B7E664
extern OverlayRelocationSection enNeoReebaOverlayInfo; // D_80B7E670
extern u32 enNeoReebaOverlayRelocations[170]; // D_80B7E684
extern u32 enNeoReebaOverlayInfoOffset; // D_80B7E92C
extern ActorInit bgMbarChairInitData; // D_80B7EA00
extern ActorInit Bg_Mbar_Chair_InitVars; // D_80B7EA00
extern InitChainEntry bgMbarChairInitVars[4]; // D_80B7EA20
extern OverlayRelocationSection bgMbarChairOverlayInfo; // D_80B7EA30
extern u32 bgMbarChairOverlayRelocations[6]; // D_80B7EA44

5
linker_scripts/code_script.txt
View File

@ -5781,8 +5781,9 @@ SECTIONS
ovl_Bg_Mbar_Chair : AT(RomLocation)
{
build/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.o(.text)
build/asm/ovl_Bg_Mbar_Chair_data.o(.data)
build/asm/ovl_Bg_Mbar_Chair_rodata.o(.rodata)
build/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.o(.data)
build/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.o(.rodata)
build/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;

5
linker_scripts/object_script.txt
View File

@ -13,4 +13,7 @@ D_0E000140 = 0x0E000140;
D_0E0001C8 = 0x0E0001C8;
D_0E0002C8 = 0x0E0002C8;
D_06000500 = 0x06000500;
D_06000500 = 0x06000500;
D_06000288 = 0x06000288;
D_060019B4 = 0x060019B4;

33
src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
View File

@ -9,7 +9,6 @@ void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx);
void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Mbar_Chair_InitVars = {
ACTOR_BG_MBAR_CHAIR,
ACTORTYPE_BG,
@ -21,12 +20,34 @@ const ActorInit Bg_Mbar_Chair_InitVars = {
(ActorFunc)BgMbarChair_Update,
(ActorFunc)BgMbarChair_Draw
};
*/
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Init.asm")
static InitChainEntry bgMbarChairInitVars[] = {
ICHAIN_F32(unkFC, 2000, ICHAIN_CONTINUE),
ICHAIN_F32(unk100, 60, ICHAIN_CONTINUE),
ICHAIN_F32(unk104, 80, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Destroy.asm")
extern BgMeshHeader D_060019B4;
extern UNK_TYPE D_06000288;
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Update.asm")
void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMbarChair* this = THIS;
GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Draw.asm")
Actor_ProcessInitChain(&this->dyna.actor, bgMbarChairInitVars);
BcCheck3_BgActorInit(&this->dyna, 0);
BgCheck3_LoadMesh(globalCtx, &this->dyna, &D_060019B4);
}
void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMbarChair* this = THIS;
BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800BDFC0(globalCtx, &D_06000288);
}

3
src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h
View File

@ -6,8 +6,7 @@
struct BgMbarChair;
typedef struct BgMbarChair {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x18];
/* 0x000 */ DynaPolyActor dyna;
} BgMbarChair; // size = 0x15C
extern const ActorInit Bg_Mbar_Chair_InitVars;

2
tables/variables.txt
View File

@ -16783,7 +16783,7 @@
0x80B7E670:("enNeoReebaOverlayInfo","OverlayRelocationSection","",0x14),
0x80B7E684:("enNeoReebaOverlayRelocations","u32","[170]",0x2a8),
0x80B7E92C:("enNeoReebaOverlayInfoOffset","u32","",0x4),
0x80B7EA00:("bgMbarChairInitData","ActorInit","",0x20),
0x80B7EA00:("Bg_Mbar_Chair_InitVars","ActorInit","",0x20),
0x80B7EA20:("bgMbarChairInitVars","ActorInitVar","[4]",0x10),
0x80B7EA30:("bgMbarChairOverlayInfo","OverlayRelocationSection","",0x14),
0x80B7EA44:("bgMbarChairOverlayRelocations","u32","[6]",0x18),