Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-27 06:40:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

obj_hana OK (#20)

Browse Source
This commit is contained in:
fullgrowngaming 2020-09-19 19:55:06 -07:00 committed by GitHub
parent dc7b8cc5b4
commit a241f57e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/variables_overlay.h
View File

@ -4688,7 +4688,7 @@ extern UNK_TYPE4 D_8095F82C; // D_8095F82C
extern OverlayRelocationSection enIshiOverlayInfo; // D_8095F830
extern u32 enIshiOverlayRelocations[178]; // D_8095F844
extern u32 enIshiOverlayInfoOffset; // D_8095FB0C
extern UNK_TYPE1 D_8095FB90; // D_8095FB90
extern UNK_TYPE1 Obj_Hana_InitVars; // Obj_Hana_InitVars
extern UNK_TYPE1 D_8095FBB0; // D_8095FBB0
extern OverlayRelocationSection objHanaOverlayInfo; // D_8095FBC0
extern u32 objHanaOverlayRelocations[6]; // D_8095FBD4

5
linker_scripts/code_script.txt
View File

@ -2060,8 +2060,9 @@ SECTIONS
ovl_Obj_Hana : AT(RomLocation)
{
build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.text)
build/asm/ovl_Obj_Hana_data.o(.data)
build/asm/ovl_Obj_Hana_rodata.o(.rodata)
build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.data)
build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.rodata)
build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;

4
linker_scripts/object_script.txt
View File

@ -11,4 +11,6 @@ D_0E000048 = 0x0E000048;
D_0E000088 = 0x0E000088;
D_0E000140 = 0x0E000140;
D_0E0001C8 = 0x0E0001C8;
D_0E0002C8 = 0x0E0002C8;
D_0E0002C8 = 0x0E0002C8;
D_06000500 = 0x06000500;

32
src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
View File

@ -1,3 +1,8 @@
/*
* File: z_obj_hana.c
* Description: Orange Graveyard Flower
*/
#include "z_obj_hana.h"
#define FLAGS 0x00000000
@ -9,7 +14,6 @@ void ObjHana_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Obj_Hana_InitVars = {
ACTOR_OBJ_HANA,
ACTORTYPE_PROP,
@ -21,12 +25,28 @@ const ActorInit Obj_Hana_InitVars = {
(ActorFunc)ObjHana_Update,
(ActorFunc)ObjHana_Draw
};
*/
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Init.asm")
extern UNK_TYPE D_06000500;
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Destroy.asm")
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE),
ICHAIN_F32(unkFC, 900, ICHAIN_CONTINUE),
ICHAIN_F32(unk100, 40, ICHAIN_CONTINUE),
ICHAIN_F32(unk104, 40, ICHAIN_STOP),
};
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Update.asm")
void ObjHana_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjHana* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
}
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Draw.asm")
void ObjHana_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800BDFC0(globalCtx, &D_06000500);
}

2
tables/variables.txt
View File

@ -9399,7 +9399,7 @@
0x8095F830:("enIshiOverlayInfo","OverlayRelocationSection","",0x14),
0x8095F844:("enIshiOverlayRelocations","u32","[178]",0x2c8),
0x8095FB0C:("enIshiOverlayInfoOffset","u32","",0x4),
0x8095FB90:("D_8095FB90","UNK_TYPE1","",0x1),
0x8095FB90:("Obj_Hana_InitVars","UNK_TYPE1","",0x1),
0x8095FBB0:("D_8095FBB0","UNK_TYPE1","",0x1),
0x8095FBC0:("objHanaOverlayInfo","OverlayRelocationSection","",0x14),
0x8095FBD4:("objHanaOverlayRelocations","u32","[6]",0x18),