Bg_Hakugin_Switch (#699)

This commit is contained in:
Maide
2022-03-05 11:42:55 -03:00
committed by GitHub
parent f9dac7d483
commit d9155eb498
4 changed files with 488 additions and 51 deletions
+1 -3
View File
@@ -3885,9 +3885,7 @@ beginseg
name "ovl_Bg_Hakugin_Switch"
compress
include "build/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.o"
include "build/data/ovl_Bg_Hakugin_Switch/ovl_Bg_Hakugin_Switch.data.o"
include "build/data/ovl_Bg_Hakugin_Switch/ovl_Bg_Hakugin_Switch.bss.o"
include "build/data/ovl_Bg_Hakugin_Switch/ovl_Bg_Hakugin_Switch.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Hakugin_Switch/ovl_Bg_Hakugin_Switch_reloc.o"
endseg
beginseg
File diff suppressed because it is too large Load Diff
@@ -6,12 +6,30 @@
struct BgHakuginSwitch;
typedef void (*BgHakuginSwitchActionFunc)(struct BgHakuginSwitch*, GlobalContext*);
typedef void (*BgHakuginSwitchUnkFunc)(struct BgHakuginSwitch*, GlobalContext*);
#define BGHAKUGINSWITCH_GET_7(thisx) ((thisx)->params & 7)
#define BGHAKUGINSWITCH_GET_10(thisx) (((thisx)->params >> 4) & 1)
#define BGHAKUGINSWITCH_GET_SWITCHFLAG(thisx) (((thisx)->params >> 8) & 0x7F)
#define BGHAKUGINSWITCH_GET_7_1 1
typedef struct BgHakuginSwitch {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x68];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ Gfx* unk_1A8;
/* 0x01AC */ BgHakuginSwitchActionFunc actionFunc;
/* 0x01B0 */ char unk_1B0[0x1C];
/* 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;
} BgHakuginSwitch; // size = 0x1CC
extern const ActorInit Bg_Hakugin_Switch_InitVars;
-5
View File
@@ -649,11 +649,6 @@ D_06009830 = 0x06009830;
D_0600ACB8 = 0x0600ACB8;
D_0600BF40 = 0x0600BF40;
// ovl_Bg_Hakugin_Switch
D_06000268 = 0x06000268;
D_060005C8 = 0x060005C8;
// ovl_Bg_Icefloe
D_060001E0 = 0x060001E0;