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

obj_dinner OK (#26) 

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
fullgrowngaming 2020-09-23 17:44:17 -07:00 committed by GitHub
parent a45af872a2
commit d1d578043b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 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

@ -13039,7 +13039,7 @@ extern UNK_TYPE4 D_80BEB8BC; // D_80BEB8BC
extern OverlayRelocationSection enChaOverlayInfo; // D_80BEB8C0 extern OverlayRelocationSection enChaOverlayInfo; // D_80BEB8C0
extern u32 enChaOverlayRelocations[23]; // D_80BEB8D4 extern u32 enChaOverlayRelocations[23]; // D_80BEB8D4
extern u32 enChaOverlayInfoOffset; // D_80BEB93C extern u32 enChaOverlayInfoOffset; // D_80BEB93C
extern UNK_TYPE1 D_80BEBA70; // D_80BEBA70 extern UNK_TYPE1 Obj_Dinner_InitVars; // Obj_Dinner_InitVars
extern OverlayRelocationSection objDinnerOverlayInfo; // D_80BEBA90 extern OverlayRelocationSection objDinnerOverlayInfo; // D_80BEBA90
extern u32 objDinnerOverlayRelocations[4]; // D_80BEBAA4 extern u32 objDinnerOverlayRelocations[4]; // D_80BEBAA4
extern u32 objDinnerOverlayInfoOffset; // D_80BEBABC extern u32 objDinnerOverlayInfoOffset; // D_80BEBABC

4
include/z64.h
View File

@ -653,7 +653,9 @@ typedef struct {
/* 0x0004 */ UNK_TYPE1 pad4[0x4]; /* 0x0004 */ UNK_TYPE1 pad4[0x4];
/* 0x0008 */ s32 cutscene; /* 0x0008 */ s32 cutscene;
/* 0x000C */ u16 time; /* 0x000C */ u16 time;
/* 0x000E */ UNK_TYPE1 padE[0xA]; /* 0x000E */ UNK_TYPE1 padE[0x2];
/* 0x0010 */ u32 isNight;
/* 0x0014 */ u32 unk14;
/* 0x0018 */ u32 day; /* 0x0018 */ u32 day;
/* 0x001C */ u32 daysElapsed; /* 0x001C */ u32 daysElapsed;
/* 0x0020 */ u8 unk20; /* 0x0020 */ u8 unk20;

5
linker_scripts/code_script.txt
View File

@ -6794,8 +6794,9 @@ SECTIONS
ovl_Obj_Dinner : AT(RomLocation) ovl_Obj_Dinner : AT(RomLocation)
{ {
build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.o(.text) build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.o(.text)
build/asm/ovl_Obj_Dinner_data.o(.data) build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.o(.data)
build/asm/ovl_Obj_Dinner_rodata.o(.rodata) build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.o(.rodata)
build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner_overlay.o(.ovl)
} }
SegmentEnd = .; SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart; SegmentSize = SegmentEnd - SegmentStart;

5
linker_scripts/object_script.txt
View File

@ -13,7 +13,8 @@ D_0E000140 = 0x0E000140;
D_0E0001C8 = 0x0E0001C8; D_0E0001C8 = 0x0E0001C8;
D_0E0002C8 = 0x0E0002C8; D_0E0002C8 = 0x0E0002C8;
/* obj_hana */
D_06000500 = 0x06000500; D_06000500 = 0x06000500;
D_06000288 = 0x06000288; /* obj_dinner */
D_060019B4 = 0x060019B4; D_060011E0 = 0x060011E0;

30
src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
View File

@ -9,7 +9,6 @@ void ObjDinner_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjDinner_Update(Actor* thisx, GlobalContext* globalCtx); void ObjDinner_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx); void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Obj_Dinner_InitVars = { const ActorInit Obj_Dinner_InitVars = {
ACTOR_OBJ_DINNER, ACTOR_OBJ_DINNER,
ACTORTYPE_PROP, ACTORTYPE_PROP,
@ -21,12 +20,31 @@ const ActorInit Obj_Dinner_InitVars = {
(ActorFunc)ObjDinner_Update, (ActorFunc)ObjDinner_Update,
(ActorFunc)ObjDinner_Draw (ActorFunc)ObjDinner_Draw
}; };
*/
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Init.asm") extern Gfx D_060011E0[];
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Destroy.asm") void ObjDinner_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjDinner* this = THIS;
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Update.asm") if (gSaveContext.perm.isNight != 1 ||
((s32)gSaveContext.perm.day % 5 == 3 && gSaveContext.perm.weekEventReg[0x16] & 1)) {
Actor_MarkForDeath(&this->actor);
}
Actor_SetScale(&this->actor, 0.1f);
}
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Draw.asm") void ObjDinner_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjDinner_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 pad;
func_8012C28C(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, SysMatrix_AppendStateToPolyOpaDisp(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, D_060011E0);
}

2
tables/variables.txt
View File

@ -18105,7 +18105,7 @@
0x80BEB8C0:("enChaOverlayInfo","OverlayRelocationSection","",0x14), 0x80BEB8C0:("enChaOverlayInfo","OverlayRelocationSection","",0x14),
0x80BEB8D4:("enChaOverlayRelocations","u32","[23]",0x5c), 0x80BEB8D4:("enChaOverlayRelocations","u32","[23]",0x5c),
0x80BEB93C:("enChaOverlayInfoOffset","u32","",0x4), 0x80BEB93C:("enChaOverlayInfoOffset","u32","",0x4),
0x80BEBA70:("D_80BEBA70","UNK_TYPE1","",0x1), 0x80BEBA70:("Obj_Dinner_InitVars","UNK_TYPE1","",0x1),
0x80BEBA90:("objDinnerOverlayInfo","OverlayRelocationSection","",0x14), 0x80BEBA90:("objDinnerOverlayInfo","OverlayRelocationSection","",0x14),
0x80BEBAA4:("objDinnerOverlayRelocations","u32","[4]",0x10), 0x80BEBAA4:("objDinnerOverlayRelocations","u32","[4]",0x10),
0x80BEBABC:("objDinnerOverlayInfoOffset","u32","",0x4), 0x80BEBABC:("objDinnerOverlayInfoOffset","u32","",0x4),