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

General Cleanup 6 (#886)

Browse Source 
* Actor structs and enums

* whoops

* whoops 2-4

* PR Review

* tabs yuck

* Last few

* boss3
This commit is contained in:
Derek Hensley
2022-07-11 23:26:58 -04:00
committed by GitHub
parent e9d4b31c3d
commit cd5de59431
277 changed files with 3538 additions and 3539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+8 -8
View File
@@ -8,14 +8,14 @@ struct ArrowIce;
typedef void (*ArrowIceActionFunc)(struct ArrowIce*, PlayState*);
typedef struct ArrowIce {
/* 0x0000 */ Actor actor;
/* 0x0144 */ s16 radius;
/* 0x0146 */ u16 timer;
/* 0x0148 */ u8 alpha;
/* 0x014C */ Vec3f firedPos;
/* 0x0158 */ f32 height;
/* 0x015C */ f32 blueingEffectMagnitude;
/* 0x0160 */ ArrowIceActionFunc actionFunc;
/* 0x000 */ Actor actor;
/* 0x144 */ s16 radius;
/* 0x146 */ u16 timer;
/* 0x148 */ u8 alpha;
/* 0x14C */ Vec3f firedPos;
/* 0x158 */ f32 height;
/* 0x15C */ f32 blueingEffectMagnitude;
/* 0x160 */ ArrowIceActionFunc actionFunc;
} ArrowIce; // size = 0x164
extern const ActorInit Arrow_Ice_InitVars;
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+5 -5
View File
@@ -19,11 +19,11 @@ enum {
};
typedef struct BgBreakwall {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ s8 unk_15C;
/* 0x015D */ u8 switchFlag;
/* 0x015E */ u8 unk_15E;
/* 0x0160 */ BgBreakwallActionFunc actionFunc;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ s8 unk_15C;
/* 0x15D */ u8 switchFlag;
/* 0x15E */ u8 unk_15E;
/* 0x160 */ BgBreakwallActionFunc actionFunc;
} BgBreakwall; // size = 0x164
extern const ActorInit Bg_Breakwall_InitVars;
src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
+6 -6
View File
@@ -8,12 +8,12 @@ struct BgCraceMovebg;
typedef void (*BgCraceMovebgActionFunc)(struct BgCraceMovebg*, PlayState*);
typedef struct BgCraceMovebg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ BgCraceMovebgActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x10];
/* 0x0170 */ s32 unk_170;
/* 0x0174 */ char unk_174[0x20];
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x18];
/* 0x15C */ BgCraceMovebgActionFunc actionFunc;
/* 0x160 */ char unk_160[0x10];
/* 0x170 */ s32 unk_170;
/* 0x174 */ char unk_174[0x20];
} BgCraceMovebg; // size = 0x194
extern const ActorInit Bg_Crace_Movebg_InitVars;
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
+4 -4
View File
@@ -9,10 +9,10 @@ struct BgCtowerGear;
#define BGCTOWERGEAR_GET_TYPE(thisx) ((thisx)->params & 3)
typedef enum {
/* 0x00 */ BGCTOWERGEAR_CEILING_COG,
/* 0x01 */ BGCTOWERGEAR_CENTER_COG,
/* 0x02 */ BGCTOWERGEAR_WATER_WHEEL,
/* 0x03 */ BGCTOWERGEAR_ORGAN
/* 0x0 */ BGCTOWERGEAR_CEILING_COG,
/* 0x1 */ BGCTOWERGEAR_CENTER_COG,
/* 0x2 */ BGCTOWERGEAR_WATER_WHEEL,
/* 0x3 */ BGCTOWERGEAR_ORGAN
} BgCtowerGearType;
typedef struct BgCtowerGear {
src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
+5 -5
View File
@@ -8,11 +8,11 @@ struct BgDanpeiMovebg;
typedef void (*BgDanpeiMovebgActionFunc)(struct BgDanpeiMovebg*, PlayState*);
typedef struct BgDanpeiMovebg {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ BgDanpeiMovebgActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x6C];
/* 0x01CC */ u16 unk_1CC;
/* 0x01CE */ char unk_1CE[0xA];
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgDanpeiMovebgActionFunc actionFunc;
/* 0x160 */ char unk_160[0x6C];
/* 0x1CC */ u16 unk_1CC;
/* 0x1CE */ char unk_1CE[0xA];
} BgDanpeiMovebg; // size = 0x1D8
extern const ActorInit Bg_Danpei_Movebg_InitVars;
src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
+24 -24
View File
@@ -18,30 +18,30 @@ typedef struct {
} BgDblueBalanceStruct; // size = 0x14
typedef struct BgDblueBalance {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ struct BgDblueBalance* unk_15C;
/* 0x0160 */ struct BgDblueBalance* unk_160;
/* 0x0164 */ struct BgDblueBalance* unk_164;
/* 0x0168 */ BgDblueBalanceActionFunc actionFunc;
/* 0x016C */ s32 unk_16C;
/* 0x0170 */ s32 unk_170;
/* 0x0174 */ s16 unk_174;
/* 0x0176 */ s16 unk_176;
/* 0x0178 */ s16 unk_178;
/* 0x017A */ s16 unk_17A;
/* 0x017C */ s8 unk_17C;
/* 0x017D */ s8 unk_17D;
/* 0x017E */ s8 unk_17E;
/* 0x017F */ s8 unk_17F;
/* 0x0180 */ s8 unk_180;
/* 0x0181 */ s8 unk_181;
/* 0x0182 */ s8 unk_182;
/* 0x0183 */ u8 unk_183;
/* 0x0184 */ s16 unk_184;
/* 0x0186 */ s8 unk_186;
/* 0x0187 */ s8 unk_187;
/* 0x0188 */ BgDblueBalanceStruct unk_188[8];
/* 0x0228 */ f32 unk_228;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ struct BgDblueBalance* unk_15C;
/* 0x160 */ struct BgDblueBalance* unk_160;
/* 0x164 */ struct BgDblueBalance* unk_164;
/* 0x168 */ BgDblueBalanceActionFunc actionFunc;
/* 0x16C */ s32 unk_16C;
/* 0x170 */ s32 unk_170;
/* 0x174 */ s16 unk_174;
/* 0x176 */ s16 unk_176;
/* 0x178 */ s16 unk_178;
/* 0x17A */ s16 unk_17A;
/* 0x17C */ s8 unk_17C;
/* 0x17D */ s8 unk_17D;
/* 0x17E */ s8 unk_17E;
/* 0x17F */ s8 unk_17F;
/* 0x180 */ s8 unk_180;
/* 0x181 */ s8 unk_181;
/* 0x182 */ s8 unk_182;
/* 0x183 */ u8 unk_183;
/* 0x184 */ s16 unk_184;
/* 0x186 */ s8 unk_186;
/* 0x187 */ s8 unk_187;
/* 0x188 */ BgDblueBalanceStruct unk_188[8];
/* 0x228 */ f32 unk_228;
} BgDblueBalance; // size = 0x22C
extern const ActorInit Bg_Dblue_Balance_InitVars;
src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
+4 -4
View File
@@ -8,10 +8,10 @@ struct BgDblueElevator;
typedef void (*BgDblueElevatorActionFunc)(struct BgDblueElevator*, PlayState*);
typedef struct BgDblueElevator {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ BgDblueElevatorActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x10];
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x18];
/* 0x15C */ BgDblueElevatorActionFunc actionFunc;
/* 0x160 */ char unk_160[0x10];
} BgDblueElevator; // size = 0x170
extern const ActorInit Bg_Dblue_Elevator_InitVars;
src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
+15 -15
View File
@@ -11,21 +11,21 @@ typedef void (*BgDblueWaterfallActionFunc)(struct BgDblueWaterfall*, PlayState*)
#define BGDBLUEWATERFALL_GET_100(thisx) (((thisx)->params >> 8) & 1)
typedef struct BgDblueWaterfall {
/* 0x0000 */ Actor actor;
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ AnimatedMaterial* unk_190;
/* 0x0194 */ BgDblueWaterfallActionFunc actionFunc;
/* 0x0198 */ f32 unk_198;
/* 0x019C */ s16 unk_19C;
/* 0x019E */ u8 unk_19E;
/* 0x019F */ u8 unk_19F;
/* 0x01A0 */ u8 unk_1A0;
/* 0x01A1 */ UNK_TYPE1 unk1A1[2];
/* 0x01A3 */ s8 unk_1A3;
/* 0x01A4 */ s16 unk_1A4;
/* 0x01A6 */ UNK_TYPE1 unk1A6[1];
/* 0x01A7 */ s8 unk_1A7;
/* 0x01A8 */ f32 unk_1A8;
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ AnimatedMaterial* unk_190;
/* 0x194 */ BgDblueWaterfallActionFunc actionFunc;
/* 0x198 */ f32 unk_198;
/* 0x19C */ s16 unk_19C;
/* 0x19E */ u8 unk_19E;
/* 0x19F */ u8 unk_19F;
/* 0x1A0 */ u8 unk_1A0;
/* 0x1A1 */ UNK_TYPE1 unk1A1[2];
/* 0x1A3 */ s8 unk_1A3;
/* 0x1A4 */ s16 unk_1A4;
/* 0x1A6 */ UNK_TYPE1 unk1A6[1];
/* 0x1A7 */ s8 unk_1A7;
/* 0x1A8 */ f32 unk_1A8;
} BgDblueWaterfall; // size = 0x1AC
extern const ActorInit Bg_Dblue_Waterfall_InitVars;
src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
+4 -4
View File
@@ -8,10 +8,10 @@ struct BgDkjailIvy;
typedef void (*BgDkjailIvyActionFunc)(struct BgDkjailIvy*, PlayState*);
typedef struct BgDkjailIvy {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x64];
/* 0x01A8 */ BgDkjailIvyActionFunc actionFunc;
/* 0x01AC */ char unk_1AC[0x4];
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x64];
/* 0x1A8 */ BgDkjailIvyActionFunc actionFunc;
/* 0x1AC */ char unk_1AC[0x4];
} BgDkjailIvy; // size = 0x1B0
extern const ActorInit Bg_Dkjail_Ivy_InitVars;
src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
+6 -6
View File
@@ -11,12 +11,12 @@ typedef void (*BgF40BlockActionFunc)(struct BgF40Block*, PlayState*);
#define BGF40BLOCK_GET_SWITCHFLAG(thisx) (((thisx)->params & 0xFE00) >> 9)
typedef struct BgF40Block {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ Path* path;
/* 0x0160 */ s32 unk_160;
/* 0x0164 */ s32 unk_164;
/* 0x0168 */ s32 unk_168;
/* 0x016C */ BgF40BlockActionFunc actionFunc;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ Path* path;
/* 0x160 */ s32 unk_160;
/* 0x164 */ s32 unk_164;
/* 0x168 */ s32 unk_168;
/* 0x16C */ BgF40BlockActionFunc actionFunc;
} BgF40Block; // size = 0x170
extern const ActorInit Bg_F40_Block_InitVars;
src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
+6 -6
View File
@@ -10,14 +10,14 @@ struct BgF40Switch;
typedef void (*BgF40SwitchActionFunc)(struct BgF40Switch*, PlayState*);
typedef struct BgF40Switch {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ s16 switchReleaseDelay; // frames until a pressed switch becomes released if nothing is still pressing it
/* 0x015E */ s8 isPressed; // Logical state of the switch (pressed or unpressed). Animation state may lag behind this slightly.
/* 0x015F */ s8 wasPressed; // used as temporary during update function
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ s16 switchReleaseDelay; // frames until a pressed switch becomes released if nothing is still pressing it
/* 0x15E */ s8 isPressed; // Logical state of the switch (pressed or unpressed). Animation state may lag behind this slightly.
/* 0x15F */ s8 wasPressed; // used as temporary during update function
// true if this switch is the one that initiated a state change; false if this switch is changing as a result of another switch tied to the same flag.
// this is a temporary flag related to something currently happening, not a permanent property of the switch.
/* 0x0160 */ s8 isInitiator;
/* 0x0164 */ BgF40SwitchActionFunc actionFunc;
/* 0x160 */ s8 isInitiator;
/* 0x164 */ BgF40SwitchActionFunc actionFunc;
} BgF40Switch; // size = 0x168
extern const ActorInit Bg_F40_Switch_InitVars;
src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
+3 -3
View File
@@ -8,9 +8,9 @@ struct BgFireWall;
typedef void (*BgFireWallActionFunc)(struct BgFireWall*, PlayState*);
typedef struct BgFireWall {
/* 0x0000 */ Actor actor;
/* 0x0144 */ BgFireWallActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x68];
/* 0x000 */ Actor actor;
/* 0x144 */ BgFireWallActionFunc actionFunc;
/* 0x148 */ char unk_148[0x68];
} BgFireWall; // size = 0x1B0
extern const ActorInit Bg_Fire_Wall_InitVars;
src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
+4 -4
View File
@@ -8,10 +8,10 @@ struct BgHakaBombwall;
typedef void (*BgHakaBombwallActionFunc)(struct BgHakaBombwall*, PlayState*);
typedef struct BgHakaBombwall {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x64];
/* 0x01A8 */ BgHakaBombwallActionFunc actionFunc;
/* 0x01AC */ char unk_1AC[0x4];
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x64];
/* 0x1A8 */ BgHakaBombwallActionFunc actionFunc;
/* 0x1AC */ char unk_1AC[0x4];
} BgHakaBombwall; // size = 0x1B0
extern const ActorInit Bg_Haka_Bombwall_InitVars;
src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
+3 -3
View File
@@ -8,9 +8,9 @@ struct BgHakuginElvpole;
typedef void (*BgHakuginElvpoleActionFunc)(struct BgHakuginElvpole*, PlayState*);
typedef struct BgHakuginElvpole {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x20];
/* 0x0164 */ BgHakuginElvpoleActionFunc actionFunc;
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x20];
/* 0x164 */ BgHakuginElvpoleActionFunc actionFunc;
} BgHakuginElvpole; // size = 0x168
extern const ActorInit Bg_Hakugin_Elvpole_InitVars;
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
+17 -17
View File
@@ -48,26 +48,26 @@ typedef struct {
} BgHakuginPostUnkStruct; // size = 0x1928
typedef struct {
/* 0x0000 */ ColliderCylinder colliders[8];
/* 0x0260 */ s32 count;
/* 0x000 */ ColliderCylinder colliders[8];
/* 0x260 */ s32 count;
} BgHakuginPostColliders; // size = 0x264
typedef struct BgHakuginPost {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ BgHakuginPostActionFunc actionFunc;
/* 0x0160 */ f32 unk_160;
/* 0x0164 */ f32 unk_164;
/* 0x0168 */ f32 unk_168;
/* 0x016C */ f32 unk_16C;
/* 0x0170 */ s32 unk_170;
/* 0x0174 */ s32 unk_174;
/* 0x0178 */ s8 unk_178;
/* 0x0179 */ s8 unk_179;
/* 0x017C */ BgHakuginPostFunc unkFunc;
/* 0x0180 */ s16 unk_180;
/* 0x0182 */ s16 unk_182;
/* 0x0184 */ s16 unk_184;
/* 0x0186 */ s16 unk_186;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgHakuginPostActionFunc actionFunc;
/* 0x160 */ f32 unk_160;
/* 0x164 */ f32 unk_164;
/* 0x168 */ f32 unk_168;
/* 0x16C */ f32 unk_16C;
/* 0x170 */ s32 unk_170;
/* 0x174 */ s32 unk_174;
/* 0x178 */ s8 unk_178;
/* 0x179 */ s8 unk_179;
/* 0x17C */ BgHakuginPostFunc unkFunc;
/* 0x180 */ s16 unk_180;
/* 0x182 */ s16 unk_182;
/* 0x184 */ s16 unk_184;
/* 0x186 */ s16 unk_186;
} BgHakuginPost; // size = 0x188
extern const ActorInit Bg_Hakugin_Post_InitVars;
src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
+15 -15
View File
@@ -15,21 +15,21 @@ typedef void (*BgHakuginSwitchUnkFunc)(struct BgHakuginSwitch*, PlayState*);
#define BGHAKUGINSWITCH_GET_7_1 1
typedef struct BgHakuginSwitch {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ Gfx* unk_1A8;
/* 0x01AC */ BgHakuginSwitchActionFunc actionFunc;
/* 0x01B0 */ s16 unk_1B0;
/* 0x01B2 */ s8 unk_1B2;
/* 0x01B4 */ BgHakuginSwitchUnkFunc unk_1B4;
/* 0x01B8 */ s16 unk_1B8;
/* 0x01BA */ s16 unk_1BA;
/* 0x01BC */ s16 unk_1BC;
/* 0x01BE */ s8 unk_1BE;
/* 0x01BF */ s8 unk_1BF;
/* 0x01C0 */ s8 unk_1C0;
/* 0x01C4 */ f32 unk_1C4;
/* 0x01C8 */ f32 unk_1C8;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ ColliderCylinder collider;
/* 0x1A8 */ Gfx* unk_1A8;
/* 0x1AC */ BgHakuginSwitchActionFunc actionFunc;
/* 0x1B0 */ s16 unk_1B0;
/* 0x1B2 */ s8 unk_1B2;
/* 0x1B4 */ BgHakuginSwitchUnkFunc unk_1B4;
/* 0x1B8 */ s16 unk_1B8;
/* 0x1BA */ s16 unk_1BA;
/* 0x1BC */ s16 unk_1BC;
/* 0x1BE */ s8 unk_1BE;
/* 0x1BF */ s8 unk_1BF;
/* 0x1C0 */ s8 unk_1C0;
/* 0x1C4 */ f32 unk_1C4;
/* 0x1C8 */ f32 unk_1C8;
} BgHakuginSwitch; // size = 0x1CC
extern const ActorInit Bg_Hakugin_Switch_InitVars;
src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
+14 -14
View File
@@ -8,20 +8,20 @@ struct BgIkanaBlock;
typedef void (*BgIkanaBlockActionFunc)(struct BgIkanaBlock*, PlayState*);
typedef struct BgIkanaBlock {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ AnimatedMaterial* unk_15C;
/* 0x0160 */ BgIkanaBlockActionFunc actionFunc;
/* 0x0164 */ f32* unk_164;
/* 0x0168 */ f32 unk_168;
/* 0x016C */ f32 unk_16C;
/* 0x0170 */ f32 unk_170;
/* 0x0174 */ Vec3s unk_174;
/* 0x017A */ u8 unk_17A;
/* 0x017B */ s8 unk_17B;
/* 0x017C */ u8 unk_17C;
/* 0x017D */ s8 unk_17D;
/* 0x017E */ s8 unk_17E;
/* 0x017F */ s8 unk_17F;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ AnimatedMaterial* unk_15C;
/* 0x160 */ BgIkanaBlockActionFunc actionFunc;
/* 0x164 */ f32* unk_164;
/* 0x168 */ f32 unk_168;
/* 0x16C */ f32 unk_16C;
/* 0x170 */ f32 unk_170;
/* 0x174 */ Vec3s unk_174;
/* 0x17A */ u8 unk_17A;
/* 0x17B */ s8 unk_17B;
/* 0x17C */ u8 unk_17C;
/* 0x17D */ s8 unk_17D;
/* 0x17E */ s8 unk_17E;
/* 0x17F */ s8 unk_17F;
} BgIkanaBlock; // size = 0x180
extern const ActorInit Bg_Ikana_Block_InitVars;
src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
+4 -4
View File
@@ -11,10 +11,10 @@ typedef void (*BgIkanaBombwallActionFunc)(struct BgIkanaBombwall*, PlayState*);
#define BGIKANABOMBWALL_GET_100(thisx) (((thisx)->params >> 8) & 1)
typedef struct BgIkanaBombwall {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ BgIkanaBombwallActionFunc actionFunc;
/* 0x01AC */ s8 unk_1AC;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ ColliderCylinder collider;
/* 0x1A8 */ BgIkanaBombwallActionFunc actionFunc;
/* 0x1AC */ s8 unk_1AC;
} BgIkanaBombwall; // size = 0x1B0
extern const ActorInit Bg_Ikana_Bombwall_InitVars;
src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
+4 -4
View File
@@ -13,10 +13,10 @@ struct BgIkanaDharma;
typedef void (*BgIkanaDharmaActionFunc)(struct BgIkanaDharma*, PlayState*);
typedef struct BgIkanaDharma {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ BgIkanaDharmaActionFunc actionFunc;
/* 0x01AC */ s8 cutsceneFramesRemaining;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ ColliderCylinder collider;
/* 0x1A8 */ BgIkanaDharmaActionFunc actionFunc;
/* 0x1AC */ s8 cutsceneFramesRemaining;
} BgIkanaDharma; // size = 0x1B0
extern const ActorInit Bg_Ikana_Dharma_InitVars;
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
+14 -14
View File
@@ -33,20 +33,20 @@ typedef struct {
} BgIkanaRotaryroomStruct3; // size = 0x58
typedef struct BgIkanaRotaryroom {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderJntSph collider;
/* 0x017C */ ColliderJntSphElement colliderElements[2];
/* 0x01FC */ AnimatedMaterial* unk_1FC;
/* 0x0200 */ BgIkanaRotaryroomUnkFunc unk_200;
/* 0x0204 */ BgIkanaRotaryroomStruct1 unk_204;
/* 0x0248 */ BgIkanaRotaryroomStruct1 unk_248[2];
/* 0x02D0 */ BgIkanaRotaryroomStruct1 unk_2D0[4];
/* 0x03E0 */ BgIkanaRotaryroomStruct2 unk_3E0[4];
/* 0x0520 */ BgIkanaRotaryroomStruct3 unk_520;
/* 0x0578 */ BgIkanaRotaryroomUnkFunc2 unk_578;
/* 0x057C */ BgIkanaRotaryroomUnkFunc2 unk_57C;
/* 0x0580 */ BgIkanaRotaryroomActionFunc actionFunc;
/* 0x0584 */ s16 unk_584;
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ ColliderJntSph collider;
/* 0x17C */ ColliderJntSphElement colliderElements[2];
/* 0x1FC */ AnimatedMaterial* unk_1FC;
/* 0x200 */ BgIkanaRotaryroomUnkFunc unk_200;
/* 0x204 */ BgIkanaRotaryroomStruct1 unk_204;
/* 0x248 */ BgIkanaRotaryroomStruct1 unk_248[2];
/* 0x2D0 */ BgIkanaRotaryroomStruct1 unk_2D0[4];
/* 0x3E0 */ BgIkanaRotaryroomStruct2 unk_3E0[4];
/* 0x520 */ BgIkanaRotaryroomStruct3 unk_520;
/* 0x578 */ BgIkanaRotaryroomUnkFunc2 unk_578;
/* 0x57C */ BgIkanaRotaryroomUnkFunc2 unk_57C;
/* 0x580 */ BgIkanaRotaryroomActionFunc actionFunc;
/* 0x584 */ s16 unk_584;
} BgIkanaRotaryroom; // size = 0x588
extern const ActorInit Bg_Ikana_Rotaryroom_InitVars;

Some files were not shown because too many files have changed in this diff Show More