Obj_Hugebombiwa (#535)

* Obj_Hugebombiwa

* PR

* PR
This commit is contained in:
Maide
2022-01-04 06:17:52 +00:00
committed by GitHub
parent bf6a4c04be
commit 0a5bc25e8d
4 changed files with 680 additions and 44 deletions
+1 -2
View File
@@ -3016,8 +3016,7 @@ beginseg
name "ovl_Obj_Hugebombiwa"
compress
include "build/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.o"
include "build/data/ovl_Obj_Hugebombiwa/ovl_Obj_Hugebombiwa.data.o"
include "build/data/ovl_Obj_Hugebombiwa/ovl_Obj_Hugebombiwa.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Hugebombiwa/ovl_Obj_Hugebombiwa_reloc.o"
endseg
beginseg
File diff suppressed because it is too large Load Diff
@@ -7,9 +7,25 @@ struct ObjHugebombiwa;
typedef void (*ObjHugebombiwaActionFunc)(struct ObjHugebombiwa*, GlobalContext*);
#define ENHUGEBOMBIWA_GET_7F(thisx) ((thisx)->params & 0x7F)
#define ENHUGEBOMBIWA_GET_100(thisx) (((thisx)->params >> 8) & 1)
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;
} EnHugebombiwaStruct; // size = 0x28
typedef struct ObjHugebombiwa {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x370];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ EnHugebombiwaStruct unk_190[20];
/* 0x04B0 */ s16 unk_4B0;
/* 0x04B2 */ s8 unk_4B2;
/* 0x04B3 */ s8 unk_4B3;
/* 0x04B4 */ ObjHugebombiwaActionFunc actionFunc;
} ObjHugebombiwa; // size = 0x4B8
-8
View File
@@ -3970,14 +3970,6 @@ D_06001D10 = 0x06001D10;
D_060003B8 = 0x060003B8;
D_060011B0 = 0x060011B0;
// ovl_Obj_Hugebombiwa
D_060009E0 = 0x060009E0;
D_06001820 = 0x06001820;
D_06001990 = 0x06001990;
D_06002F60 = 0x06002F60;
D_06003110 = 0x06003110;
// ovl_Obj_Hunsui
D_06000220 = 0x06000220;