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

clean things up

Browse Source
This commit is contained in:
mzxrules
2023-10-11 03:37:00 -04:00
parent 5f057d56e0
commit cc17013391
3 changed files with 416 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+2 -3
View File
@@ -656,7 +656,7 @@ beginseg
include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.o"
#ifdef NON_MATCHING
include "build/src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc.o"
#else
#else
include "build/data/ovl_file_choose/ovl_file_choose.reloc.o"
#endif
endseg
@@ -1340,8 +1340,7 @@ beginseg
name "ovl_En_Honotrap"
compress
include "build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o"
include "build/data/ovl_En_Honotrap/ovl_En_Honotrap.data.o"
include "build/data/ovl_En_Honotrap/ovl_En_Honotrap.reloc.o"
include "build/src/overlays/actors/ovl_En_Honotrap/ovl_En_Honotrap_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+392 -390
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
+22 -14
View File
@@ -16,32 +16,40 @@ typedef union {
} EnHonotrapCollider; // size = 0xD8
typedef struct {
/* 0x00 */ Vec3f unk0;
/* 0x00 */ Vec3f pos;
/* 0x0C */ f32 unkC;
/* 0x10 */ s16 unk_10;
/* 0x12 */ u8 unk12;
} EnHonotrapArr; //size 0x14
/* 0x10 */ s16 flameScroll;
/* 0x12 */ u8 isDrawn;
} EnHonotrapFlameElement; //size 0x14
typedef struct {
f32 unk0;
f32 unk4;
f32 unk8;
EnHonotrapArr unkC[6];
} EnHonotrap23C;
EnHonotrapFlameElement flameList[6];
} EnHonotrapFlameGroup;
typedef struct EnHonotrap {
/* 0x000 */ Actor actor;
/* 0x144 */ EnHonotrapActionFunc actionFunc;
/* 0x148 */ EnHonotrapCollider collider;
/* 0x220 */ s16 unk220;
/* 0x222 */ s16 unk222;
/* 0x220 */ s16 timer;
/* 0x222 */ s16 eyeState;
/* 0x224 */ s16 unk224;
/* 0x228 */ Vec3f unk228;
/* 0x234 */ f32 unk234;
/* 0x238 */ s16 unk238;
/* 0x23A */ s16 unk23A;
/* 0x23C */ EnHonotrap23C unk23C;
/* 0x2C0 */ u8 unk2C0;
/* 0x228 */ Vec3f targetPos;
/* 0x234 */ f32 speedMod;
/* 0x238 */ s16 bobPhase;
/* 0x23A */ s16 flameScroll;
/* 0x23C */ EnHonotrapFlameGroup flameGroup;
/* 0x2C0 */ u8 colChkFlags;
} EnHonotrap; // size = 0x2C4
typedef enum {
HONOTRAP_EYE,
HONOTRAP_FLAME_MOVE,
HONOTRAP_FLAME_DROP,
HONOTRAP_EYE_MUTI_FLAME,
HONOTRAP_FLAME_GROUP
} EnHonotrapType;
#endif // Z_EN_HONOTRAP_H