izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Obj_Dhouse (#648)

Browse Source 
* Obj_Dhouse

* PR

* PR
This commit is contained in:
Maide
2022-02-14 00:58:19 +00:00
committed by GitHub
parent d588870b7a
commit 45cee7d8af
4 changed files with 522 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3891,8 +3891,7 @@ beginseg
name "ovl_Obj_Dhouse"
compress
include "build/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.o"
include "build/data/ovl_Obj_Dhouse/ovl_Obj_Dhouse.data.o"
include "build/data/ovl_Obj_Dhouse/ovl_Obj_Dhouse.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Dhouse/ovl_Obj_Dhouse_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c
+487 -30
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h
+34 -3
View File
@@ -7,11 +7,42 @@ struct ObjDhouse;
typedef void (*ObjDhouseActionFunc)(struct ObjDhouse*, GlobalContext*);
#define OBJDHOUSE_GET_7F(thisx) ((thisx)->params & 0x7F)
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3s unk_18;
/* 0x1E */ s8 unk_1E;
} ObjDhouseStruct1; // size = 0x20
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ f32 unk_18;
/* 0x1C */ Vec3s unk_1C;
/* 0x22 */ s16 unk_22;
/* 0x24 */ s16 unk_24;
/* 0x26 */ s16 unk_26;
/* 0x28 */ s8 unk_28;
/* 0x29 */ u8 unk_29;
} ObjDhouseStruct2; // size = 0x2C
typedef struct {
/* 0x00 */ Gfx* unk_00;
/* 0x04 */ Gfx* unk_04;
/* 0x08 */ Vec3f unk_08;
/* 0x14 */ Vec3f unk_14;
/* 0x20 */ Vec3s unk_20;
/* 0x26 */ s8 unk_26;
} ObjDhouseStruct3; // size = 0x28
typedef struct ObjDhouse {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ObjDhouseActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x1214];
/* 0x0160 */ ObjDhouseStruct1 unk_160[7];
/* 0x0240 */ ObjDhouseStruct2 unk_240[100];
/* 0x1370 */ s16 unk_1370;
} ObjDhouse; // size = 0x1374
extern const ActorInit Obj_Dhouse_InitVars;
undefined_syms.txt
-7
View File
@@ -2160,13 +2160,6 @@ D_06001040 = 0x06001040;
D_06000180 = 0x06000180;
D_06000BA0 = 0x06000BA0;
// ovl_Obj_Dhouse
D_06004928 = 0x06004928;
D_06005A78 = 0x06005A78;
D_06008040 = 0x06008040;
D_060081D8 = 0x060081D8;
// ovl_Obj_Dora
D_06003FD0 = 0x06003FD0;