mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Remove (ActorFunc) casts in initvars (#1571)

Browse source 
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format

Achieved by using the following regex:

(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)

replaced with

$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19

plus a change from /**/ to #if 0 #endif in docs/

* Manual fixes
This commit is contained in:
Dragorn421 2023-10-30 15:19:16 +01:00 • committed by GitHub
parent 4908b8b37c
commit 8718a5c8c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
431 changed files with 3899 additions and 3893 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
docs/tutorial/beginning_decomp.md
View file

@ -638,19 +638,19 @@ void func_80A87F44(Actor* thisx, PlayState* play);
void func_80A87BEC(EnJj* this, PlayState* play);
void func_80A87C30(EnJj* this, PlayState* play);
/*
#if 0
ActorInit En_Jj_InitVars = {
ACTOR_EN_JJ,
ACTORTYPE_ITEMACTION,
FLAGS,
OBJECT_JJ,
sizeof(EnJj),
(ActorFunc)EnJj_Init,
(ActorFunc)EnJj_Destroy,
(ActorFunc)EnJj_Update,
(ActorFunc)EnJj_Draw,
/**/ ACTOR_EN_JJ,
/**/ ACTORTYPE_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_JJ,
/**/ sizeof(EnJj),
/**/ EnJj_Init,
/**/ EnJj_Destroy,
/**/ EnJj_Update,
/**/ EnJj_Draw,
};
*/
#endif
extern ColliderCylinderInit D_80A88CB4;
// static ColliderCylinderInit sCylinderInit = {

54
docs/tutorial/data.md
View file

@ -94,15 +94,15 @@ s32 D_80B18910[] = { 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000,
s32 D_80B1893C[] = { 0x00000000, 0x00000000, 0xFF000000 };
ActorInit En_Tg_InitVars = {
ACTOR_EN_TG,
ACTORTYPE_NPC,
FLAGS,
OBJECT_MU,
sizeof(EnTg),
(ActorFunc)EnTg_Init,
(ActorFunc)EnTg_Destroy,
(ActorFunc)EnTg_Update,
(ActorFunc)EnTg_Draw,
/**/ ACTOR_EN_TG,
/**/ ACTORTYPE_NPC,
/**/ FLAGS,
/**/ OBJECT_MU,
/**/ sizeof(EnTg),
/**/ EnTg_Init,
/**/ EnTg_Destroy,
/**/ EnTg_Update,
/**/ EnTg_Draw,
};
s32 D_80B18968[] = { 0x00000000, 0x44480000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
@ -490,15 +490,15 @@ To replace the `extern`, because the data is in a separate file, we include the
Lastly, uncomment the InitVars block that's been sitting there the whole time. The data section of the file now looks like
```C
ActorInit En_Jj_InitVars = {
ACTOR_EN_JJ,
ACTORTYPE_ITEMACTION,
FLAGS,
OBJECT_JJ,
sizeof(EnJj),
(ActorFunc)EnJj_Init,
(ActorFunc)EnJj_Destroy,
(ActorFunc)EnJj_Update,
(ActorFunc)EnJj_Draw,
/**/ ACTOR_EN_JJ,
/**/ ACTORTYPE_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_JJ,
/**/ sizeof(EnJj),
/**/ EnJj_Init,
/**/ EnJj_Destroy,
/**/ EnJj_Update,
/**/ EnJj_Draw,
};
#include "en_jj_cutscene_data.c" EARLY
@ -567,15 +567,15 @@ Notice that the numbers in the bottom pane is all shifted one word to the left.
```C
ActorInit En_Jj_InitVars = {
ACTOR_EN_JJ,
ACTORTYPE_ITEMACTION,
FLAGS,
OBJECT_JJ,
sizeof(EnJj),
(ActorFunc)EnJj_Init,
(ActorFunc)EnJj_Destroy,
(ActorFunc)EnJj_Update,
(ActorFunc)EnJj_Draw,
/**/ ACTOR_EN_JJ,
/**/ ACTORTYPE_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_JJ,
/**/ sizeof(EnJj),
/**/ EnJj_Init,
/**/ EnJj_Destroy,
/**/ EnJj_Update,
/**/ EnJj_Draw,
};
s32 usused = 0;

18
src/code/z_en_a_keep.c
View file

@ -21,15 +21,15 @@ void EnAObj_SetupBoulderFragment(EnAObj* this, s16 type);
void EnAObj_SetupBlock(EnAObj* this, s16 type);
ActorInit En_A_Obj_InitVars = {
ACTOR_EN_A_OBJ,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(EnAObj),
(ActorFunc)EnAObj_Init,
(ActorFunc)EnAObj_Destroy,
(ActorFunc)EnAObj_Update,
(ActorFunc)EnAObj_Draw,
/**/ ACTOR_EN_A_OBJ,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(EnAObj),
/**/ EnAObj_Init,
/**/ EnAObj_Destroy,
/**/ EnAObj_Update,
/**/ EnAObj_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/code/z_en_item00.c
View file

@ -21,15 +21,15 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play);
void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play);
ActorInit En_Item00_InitVars = {
ACTOR_EN_ITEM00,
ACTORCAT_MISC,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(EnItem00),
(ActorFunc)EnItem00_Init,
(ActorFunc)EnItem00_Destroy,
(ActorFunc)EnItem00_Update,
(ActorFunc)EnItem00_Draw,
/**/ ACTOR_EN_ITEM00,
/**/ ACTORCAT_MISC,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(EnItem00),
/**/ EnItem00_Init,
/**/ EnItem00_Destroy,
/**/ EnItem00_Update,
/**/ EnItem00_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/code/z_player_call.c
View file

@ -18,15 +18,15 @@ void Player_Update(Actor* thisx, PlayState* play);
void Player_Draw(Actor* thisx, PlayState* play);
ActorInit Player_InitVars = {
ACTOR_PLAYER,
ACTORCAT_PLAYER,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(Player),
(ActorFunc)PlayerCall_Init,
(ActorFunc)PlayerCall_Destroy,
(ActorFunc)PlayerCall_Update,
(ActorFunc)PlayerCall_Draw,
/**/ ACTOR_PLAYER,
/**/ ACTORCAT_PLAYER,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(Player),
/**/ PlayerCall_Init,
/**/ PlayerCall_Destroy,
/**/ PlayerCall_Update,
/**/ PlayerCall_Draw,
};
void PlayerCall_InitFuncPtrs(void) {

18
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -12,15 +12,15 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play);
void ArmsHook_Shoot(ArmsHook* this, PlayState* play);
ActorInit Arms_Hook_InitVars = {
ACTOR_ARMS_HOOK,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_LINK_BOY,
sizeof(ArmsHook),
(ActorFunc)ArmsHook_Init,
(ActorFunc)ArmsHook_Destroy,
(ActorFunc)ArmsHook_Update,
(ActorFunc)ArmsHook_Draw,
/**/ ACTOR_ARMS_HOOK,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_LINK_BOY,
/**/ sizeof(ArmsHook),
/**/ ArmsHook_Init,
/**/ ArmsHook_Destroy,
/**/ ArmsHook_Update,
/**/ ArmsHook_Draw,
};
static ColliderQuadInit sQuadInit = {

18
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -21,15 +21,15 @@ void ArrowFire_Hit(ArrowFire* this, PlayState* play);
#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
ActorInit Arrow_Fire_InitVars = {
ACTOR_ARROW_FIRE,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ArrowFire),
(ActorFunc)ArrowFire_Init,
(ActorFunc)ArrowFire_Destroy,
(ActorFunc)ArrowFire_Update,
(ActorFunc)ArrowFire_Draw,
/**/ ACTOR_ARROW_FIRE,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(ArrowFire),
/**/ ArrowFire_Init,
/**/ ArrowFire_Destroy,
/**/ ArrowFire_Update,
/**/ ArrowFire_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -22,15 +22,15 @@ void ArrowIce_Hit(ArrowIce* this, PlayState* play);
#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
ActorInit Arrow_Ice_InitVars = {
ACTOR_ARROW_ICE,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ArrowIce),
(ActorFunc)ArrowIce_Init,
(ActorFunc)ArrowIce_Destroy,
(ActorFunc)ArrowIce_Update,
(ActorFunc)ArrowIce_Draw,
/**/ ACTOR_ARROW_ICE,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(ArrowIce),
/**/ ArrowIce_Init,
/**/ ArrowIce_Destroy,
/**/ ArrowIce_Update,
/**/ ArrowIce_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -22,15 +22,15 @@ void ArrowLight_Hit(ArrowLight* this, PlayState* play);
#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
ActorInit Arrow_Light_InitVars = {
ACTOR_ARROW_LIGHT,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ArrowLight),
(ActorFunc)ArrowLight_Init,
(ActorFunc)ArrowLight_Destroy,
(ActorFunc)ArrowLight_Update,
(ActorFunc)ArrowLight_Draw,
/**/ ACTOR_ARROW_LIGHT,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(ArrowLight),
/**/ ArrowLight_Init,
/**/ ArrowLight_Destroy,
/**/ ArrowLight_Update,
/**/ ArrowLight_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View file

@ -33,15 +33,15 @@ void func_8086CB10(BgBdanObjects* this, PlayState* play);
void func_8086CB8C(BgBdanObjects* this, PlayState* play);
ActorInit Bg_Bdan_Objects_InitVars = {
ACTOR_BG_BDAN_OBJECTS,
ACTORCAT_BG,
FLAGS,
OBJECT_BDAN_OBJECTS,
sizeof(BgBdanObjects),
(ActorFunc)BgBdanObjects_Init,
(ActorFunc)BgBdanObjects_Destroy,
(ActorFunc)BgBdanObjects_Update,
(ActorFunc)BgBdanObjects_Draw,
/**/ ACTOR_BG_BDAN_OBJECTS,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_BDAN_OBJECTS,
/**/ sizeof(BgBdanObjects),
/**/ BgBdanObjects_Init,
/**/ BgBdanObjects_Destroy,
/**/ BgBdanObjects_Update,
/**/ BgBdanObjects_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
View file

@ -43,15 +43,15 @@ void func_8086DDA8(BgBdanSwitch* this);
void func_8086DDC0(BgBdanSwitch* this, PlayState* play);
ActorInit Bg_Bdan_Switch_InitVars = {
ACTOR_BG_BDAN_SWITCH,
ACTORCAT_SWITCH,
FLAGS,
OBJECT_BDAN_OBJECTS,
sizeof(BgBdanSwitch),
(ActorFunc)BgBdanSwitch_Init,
(ActorFunc)BgBdanSwitch_Destroy,
(ActorFunc)BgBdanSwitch_Update,
(ActorFunc)BgBdanSwitch_Draw,
/**/ ACTOR_BG_BDAN_SWITCH,
/**/ ACTORCAT_SWITCH,
/**/ FLAGS,
/**/ OBJECT_BDAN_OBJECTS,
/**/ sizeof(BgBdanSwitch),
/**/ BgBdanSwitch_Init,
/**/ BgBdanSwitch_Destroy,
/**/ BgBdanSwitch_Update,
/**/ BgBdanSwitch_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[] = {

18
src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
View file

@ -18,15 +18,15 @@ void BgBomGuard_Update(Actor* thisx, PlayState* play);
void func_8086E638(BgBomGuard* this, PlayState* play);
ActorInit Bg_Bom_Guard_InitVars = {
ACTOR_BG_BOM_GUARD,
ACTORCAT_PROP,
FLAGS,
OBJECT_BOWL,
sizeof(BgBomGuard),
(ActorFunc)BgBomGuard_Init,
(ActorFunc)BgBomGuard_Destroy,
(ActorFunc)BgBomGuard_Update,
NULL,
/**/ ACTOR_BG_BOM_GUARD,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_BOWL,
/**/ sizeof(BgBomGuard),
/**/ BgBomGuard_Init,
/**/ BgBomGuard_Destroy,
/**/ BgBomGuard_Update,
/**/ NULL,
};
void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) {

18
src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
View file

@ -70,15 +70,15 @@ static ColliderTrisInit sTrisInit = {
};
ActorInit Bg_Bombwall_InitVars = {
ACTOR_BG_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_FIELD_KEEP,
sizeof(BgBombwall),
(ActorFunc)BgBombwall_Init,
(ActorFunc)BgBombwall_Destroy,
(ActorFunc)BgBombwall_Update,
(ActorFunc)BgBombwall_Draw,
/**/ ACTOR_BG_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_FIELD_KEEP,
/**/ sizeof(BgBombwall),
/**/ BgBombwall_Init,
/**/ BgBombwall_Destroy,
/**/ BgBombwall_Update,
/**/ BgBombwall_Draw,
};
void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
View file

@ -25,15 +25,15 @@ void BgBowlWall_FinishFall(BgBowlWall* this, PlayState* play);
void BgBowlWall_Reset(BgBowlWall* this, PlayState* play);
ActorInit Bg_Bowl_Wall_InitVars = {
ACTOR_BG_BOWL_WALL,
ACTORCAT_PROP,
FLAGS,
OBJECT_BOWL,
sizeof(BgBowlWall),
(ActorFunc)BgBowlWall_Init,
(ActorFunc)BgBowlWall_Destroy,
(ActorFunc)BgBowlWall_Update,
(ActorFunc)BgBowlWall_Draw,
/**/ ACTOR_BG_BOWL_WALL,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_BOWL,
/**/ sizeof(BgBowlWall),
/**/ BgBowlWall_Init,
/**/ BgBowlWall_Destroy,
/**/ BgBowlWall_Update,
/**/ BgBowlWall_Draw,
};
static Vec3f sBullseyeOffset[] = {

18
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View file

@ -27,15 +27,15 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play);
void BgBreakwall_LavaCoverMove(BgBreakwall* this, PlayState* play);
ActorInit Bg_Breakwall_InitVars = {
ACTOR_BG_BREAKWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgBreakwall),
(ActorFunc)BgBreakwall_Init,
(ActorFunc)BgBreakwall_Destroy,
(ActorFunc)BgBreakwall_Update,
NULL,
/**/ ACTOR_BG_BREAKWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgBreakwall),
/**/ BgBreakwall_Init,
/**/ BgBreakwall_Destroy,
/**/ BgBreakwall_Update,
/**/ NULL,
};
static ColliderQuadInit sQuadInit = {

18
src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c
View file

@ -18,15 +18,15 @@ void BgDdanJd_Idle(BgDdanJd* this, PlayState* play);
void BgDdanJd_Move(BgDdanJd* this, PlayState* play);
ActorInit Bg_Ddan_Jd_InitVars = {
ACTOR_BG_DDAN_JD,
ACTORCAT_BG,
FLAGS,
OBJECT_DDAN_OBJECTS,
sizeof(BgDdanJd),
(ActorFunc)BgDdanJd_Init,
(ActorFunc)BgDdanJd_Destroy,
(ActorFunc)BgDdanJd_Update,
(ActorFunc)BgDdanJd_Draw,
/**/ ACTOR_BG_DDAN_JD,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DDAN_OBJECTS,
/**/ sizeof(BgDdanJd),
/**/ BgDdanJd_Init,
/**/ BgDdanJd_Destroy,
/**/ BgDdanJd_Update,
/**/ BgDdanJd_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
View file

@ -19,15 +19,15 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, PlayState* play);
void BgDdanKd_DoNothing(BgDdanKd* this, PlayState* play);
ActorInit Bg_Ddan_Kd_InitVars = {
ACTOR_BG_DDAN_KD,
ACTORCAT_BG,
FLAGS,
OBJECT_DDAN_OBJECTS,
sizeof(BgDdanKd),
(ActorFunc)BgDdanKd_Init,
(ActorFunc)BgDdanKd_Destroy,
(ActorFunc)BgDdanKd_Update,
(ActorFunc)BgDdanKd_Draw,
/**/ ACTOR_BG_DDAN_KD,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DDAN_OBJECTS,
/**/ sizeof(BgDdanKd),
/**/ BgDdanKd_Init,
/**/ BgDdanKd_Destroy,
/**/ BgDdanKd_Update,
/**/ BgDdanKd_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View file

@ -21,15 +21,15 @@ void BgDodoago_DoNothing(BgDodoago* this, PlayState* play);
void BgDodoago_LightOneEye(BgDodoago* this, PlayState* play);
ActorInit Bg_Dodoago_InitVars = {
ACTOR_BG_DODOAGO,
ACTORCAT_BG,
FLAGS,
OBJECT_DDAN_OBJECTS,
sizeof(BgDodoago),
(ActorFunc)BgDodoago_Init,
(ActorFunc)BgDodoago_Destroy,
(ActorFunc)BgDodoago_Update,
(ActorFunc)BgDodoago_Draw,
/**/ ACTOR_BG_DODOAGO,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DDAN_OBJECTS,
/**/ sizeof(BgDodoago),
/**/ BgDodoago_Init,
/**/ BgDodoago_Destroy,
/**/ BgDodoago_Update,
/**/ BgDodoago_Draw,
};
static ColliderCylinderInit sColCylinderInitMain = {

18
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View file

@ -55,15 +55,15 @@ void BgDyYoseizo_DrawEffects(BgDyYoseizo* this, PlayState* play);
static s32 sUnusedGetItemIds[] = { GI_FARORES_WIND, GI_NAYRUS_LOVE, GI_DINS_FIRE };
ActorInit Bg_Dy_Yoseizo_InitVars = {
ACTOR_BG_DY_YOSEIZO,
ACTORCAT_PROP,
FLAGS,
OBJECT_DY_OBJ,
sizeof(BgDyYoseizo),
(ActorFunc)BgDyYoseizo_Init,
(ActorFunc)BgDyYoseizo_Destroy,
(ActorFunc)BgDyYoseizo_Update,
NULL,
/**/ ACTOR_BG_DY_YOSEIZO,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DY_OBJ,
/**/ sizeof(BgDyYoseizo),
/**/ BgDyYoseizo_Init,
/**/ BgDyYoseizo_Destroy,
/**/ BgDyYoseizo_Update,
/**/ NULL,
};
void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) {

18
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -26,15 +26,15 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play);
void BgGanonOtyuka_DoNothing(Actor* thisx, PlayState* play);
ActorInit Bg_Ganon_Otyuka_InitVars = {
ACTOR_BG_GANON_OTYUKA,
ACTORCAT_PROP,
FLAGS,
OBJECT_GANON,
sizeof(BgGanonOtyuka),
(ActorFunc)BgGanonOtyuka_Init,
(ActorFunc)BgGanonOtyuka_Destroy,
(ActorFunc)BgGanonOtyuka_Update,
(ActorFunc)BgGanonOtyuka_Draw,
/**/ ACTOR_BG_GANON_OTYUKA,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GANON,
/**/ sizeof(BgGanonOtyuka),
/**/ BgGanonOtyuka_Init,
/**/ BgGanonOtyuka_Destroy,
/**/ BgGanonOtyuka_Update,
/**/ BgGanonOtyuka_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
View file

@ -21,15 +21,15 @@ void func_808783AC(BgGateShutter* this, PlayState* play);
void func_808783D4(BgGateShutter* this, PlayState* play);
ActorInit Bg_Gate_Shutter_InitVars = {
ACTOR_BG_GATE_SHUTTER,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_SPOT01_MATOYAB,
sizeof(BgGateShutter),
(ActorFunc)BgGateShutter_Init,
(ActorFunc)BgGateShutter_Destroy,
(ActorFunc)BgGateShutter_Update,
(ActorFunc)BgGateShutter_Draw,
/**/ ACTOR_BG_GATE_SHUTTER,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_SPOT01_MATOYAB,
/**/ sizeof(BgGateShutter),
/**/ BgGateShutter_Init,
/**/ BgGateShutter_Destroy,
/**/ BgGateShutter_Update,
/**/ BgGateShutter_Draw,
};
void BgGateShutter_Init(Actor* thisx, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View file

@ -20,15 +20,15 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play);
void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play);
ActorInit Bg_Gjyo_Bridge_InitVars = {
ACTOR_BG_GJYO_BRIDGE,
ACTORCAT_PROP,
FLAGS,
OBJECT_GJYO_OBJECTS,
sizeof(BgGjyoBridge),
(ActorFunc)BgGjyoBridge_Init,
(ActorFunc)BgGjyoBridge_Destroy,
(ActorFunc)BgGjyoBridge_Update,
(ActorFunc)BgGjyoBridge_Draw,
/**/ ACTOR_BG_GJYO_BRIDGE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GJYO_OBJECTS,
/**/ sizeof(BgGjyoBridge),
/**/ BgGjyoBridge_Init,
/**/ BgGjyoBridge_Destroy,
/**/ BgGjyoBridge_Update,
/**/ BgGjyoBridge_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
View file

@ -22,15 +22,15 @@ void BgGndDarkmeiro_UpdateStaticBlock(BgGndDarkmeiro* this, PlayState* play);
void BgGndDarkmeiro_UpdateSwitchBlock(BgGndDarkmeiro* this, PlayState* play);
ActorInit Bg_Gnd_Darkmeiro_InitVars = {
ACTOR_BG_GND_DARKMEIRO,
ACTORCAT_PROP,
FLAGS,
OBJECT_DEMO_KEKKAI,
sizeof(BgGndDarkmeiro),
(ActorFunc)BgGndDarkmeiro_Init,
(ActorFunc)BgGndDarkmeiro_Destroy,
(ActorFunc)BgGndDarkmeiro_Update,
NULL,
/**/ ACTOR_BG_GND_DARKMEIRO,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DEMO_KEKKAI,
/**/ sizeof(BgGndDarkmeiro),
/**/ BgGndDarkmeiro_Init,
/**/ BgGndDarkmeiro_Destroy,
/**/ BgGndDarkmeiro_Update,
/**/ NULL,
};
void BgGndDarkmeiro_ToggleBlock(BgGndDarkmeiro* this, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
View file

@ -19,15 +19,15 @@ void BgGndFiremeiro_Shake(BgGndFiremeiro* this, PlayState* play);
void BgGndFiremeiro_Rise(BgGndFiremeiro* this, PlayState* play);
ActorInit Bg_Gnd_Firemeiro_InitVars = {
ACTOR_BG_GND_FIREMEIRO,
ACTORCAT_PROP,
FLAGS,
OBJECT_DEMO_KEKKAI,
sizeof(BgGndFiremeiro),
(ActorFunc)BgGndFiremeiro_Init,
(ActorFunc)BgGndFiremeiro_Destroy,
(ActorFunc)BgGndFiremeiro_Update,
(ActorFunc)BgGndFiremeiro_Draw,
/**/ ACTOR_BG_GND_FIREMEIRO,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DEMO_KEKKAI,
/**/ sizeof(BgGndFiremeiro),
/**/ BgGndFiremeiro_Init,
/**/ BgGndFiremeiro_Destroy,
/**/ BgGndFiremeiro_Update,
/**/ BgGndFiremeiro_Draw,
};
void BgGndFiremeiro_Init(Actor* thisx, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
View file

@ -24,15 +24,15 @@ void BgGndIceblock_Idle(BgGndIceblock* this, PlayState* play);
void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play);
ActorInit Bg_Gnd_Iceblock_InitVars = {
ACTOR_BG_GND_ICEBLOCK,
ACTORCAT_PROP,
FLAGS,
OBJECT_DEMO_KEKKAI,
sizeof(BgGndIceblock),
(ActorFunc)BgGndIceblock_Init,
(ActorFunc)BgGndIceblock_Destroy,
(ActorFunc)BgGndIceblock_Update,
(ActorFunc)BgGndIceblock_Draw,
/**/ ACTOR_BG_GND_ICEBLOCK,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DEMO_KEKKAI,
/**/ sizeof(BgGndIceblock),
/**/ BgGndIceblock_Init,
/**/ BgGndIceblock_Destroy,
/**/ BgGndIceblock_Update,
/**/ BgGndIceblock_Draw,
};
static Color_RGBA8 sWhite = { 250, 250, 250, 255 };

18
src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c
View file

@ -15,15 +15,15 @@ void BgGndNisekabe_Update(Actor* thisx, PlayState* play);
void BgGndNisekabe_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Gnd_Nisekabe_InitVars = {
ACTOR_BG_GND_NISEKABE,
ACTORCAT_PROP,
FLAGS,
OBJECT_DEMO_KEKKAI,
sizeof(BgGndNisekabe),
(ActorFunc)BgGndNisekabe_Init,
(ActorFunc)BgGndNisekabe_Destroy,
(ActorFunc)BgGndNisekabe_Update,
(ActorFunc)BgGndNisekabe_Draw,
/**/ ACTOR_BG_GND_NISEKABE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DEMO_KEKKAI,
/**/ sizeof(BgGndNisekabe),
/**/ BgGndNisekabe_Init,
/**/ BgGndNisekabe_Destroy,
/**/ BgGndNisekabe_Update,
/**/ BgGndNisekabe_Draw,
};
void BgGndNisekabe_Init(Actor* thisx, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View file

@ -20,15 +20,15 @@ void func_8087B284(BgGndSoulmeiro* this, PlayState* play);
void func_8087B350(BgGndSoulmeiro* this, PlayState* play);
ActorInit Bg_Gnd_Soulmeiro_InitVars = {
ACTOR_BG_GND_SOULMEIRO,
ACTORCAT_PROP,
FLAGS,
OBJECT_DEMO_KEKKAI,
sizeof(BgGndSoulmeiro),
(ActorFunc)BgGndSoulmeiro_Init,
(ActorFunc)BgGndSoulmeiro_Destroy,
(ActorFunc)BgGndSoulmeiro_Update,
(ActorFunc)BgGndSoulmeiro_Draw,
/**/ ACTOR_BG_GND_SOULMEIRO,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DEMO_KEKKAI,
/**/ sizeof(BgGndSoulmeiro),
/**/ BgGndSoulmeiro_Init,
/**/ BgGndSoulmeiro_Destroy,
/**/ BgGndSoulmeiro_Update,
/**/ BgGndSoulmeiro_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
View file

@ -21,15 +21,15 @@ void func_8087BAAC(BgHaka* this, PlayState* play);
void func_8087BAE4(BgHaka* this, PlayState* play);
ActorInit Bg_Haka_InitVars = {
ACTOR_BG_HAKA,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA,
sizeof(BgHaka),
(ActorFunc)BgHaka_Init,
(ActorFunc)BgHaka_Destroy,
(ActorFunc)BgHaka_Update,
(ActorFunc)BgHaka_Draw,
/**/ ACTOR_BG_HAKA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA,
/**/ sizeof(BgHaka),
/**/ BgHaka_Init,
/**/ BgHaka_Destroy,
/**/ BgHaka_Update,
/**/ BgHaka_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
View file

@ -53,15 +53,15 @@ static f32 sStatueDistToPlayer = 0;
static s16 sStatueRotY;
ActorInit Bg_Haka_Gate_InitVars = {
ACTOR_BG_HAKA_GATE,
ACTORCAT_PROP,
FLAGS,
OBJECT_HAKA_OBJECTS,
sizeof(BgHakaGate),
(ActorFunc)BgHakaGate_Init,
(ActorFunc)BgHakaGate_Destroy,
(ActorFunc)BgHakaGate_Update,
(ActorFunc)BgHakaGate_Draw,
/**/ ACTOR_BG_HAKA_GATE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJECTS,
/**/ sizeof(BgHakaGate),
/**/ BgHakaGate_Init,
/**/ BgHakaGate_Destroy,
/**/ BgHakaGate_Update,
/**/ BgHakaGate_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c
View file

@ -25,15 +25,15 @@ void func_8087D720(BgHakaHuta* this, PlayState* play);
void BgHakaHuta_DoNothing(BgHakaHuta* this, PlayState* play);
ActorInit Bg_Haka_Huta_InitVars = {
ACTOR_BG_HAKA_HUTA,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKACH_OBJECTS,
sizeof(BgHakaHuta),
(ActorFunc)BgHakaHuta_Init,
(ActorFunc)BgHakaHuta_Destroy,
(ActorFunc)BgHakaHuta_Update,
(ActorFunc)BgHakaHuta_Draw,
/**/ ACTOR_BG_HAKA_HUTA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKACH_OBJECTS,
/**/ sizeof(BgHakaHuta),
/**/ BgHakaHuta_Init,
/**/ BgHakaHuta_Destroy,
/**/ BgHakaHuta_Update,
/**/ BgHakaHuta_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
View file

@ -20,15 +20,15 @@ void func_8087DBF0(BgHakaMegane* this, PlayState* play);
void BgHakaMegane_DoNothing(BgHakaMegane* this, PlayState* play);
ActorInit Bg_Haka_Megane_InitVars = {
ACTOR_BG_HAKA_MEGANE,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgHakaMegane),
(ActorFunc)BgHakaMegane_Init,
(ActorFunc)BgHakaMegane_Destroy,
(ActorFunc)BgHakaMegane_Update,
NULL,
/**/ ACTOR_BG_HAKA_MEGANE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgHakaMegane),
/**/ BgHakaMegane_Init,
/**/ BgHakaMegane_Destroy,
/**/ BgHakaMegane_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c
View file

@ -24,15 +24,15 @@ void func_8087E2D8(BgHakaMeganeBG* this, PlayState* play);
void func_8087E34C(BgHakaMeganeBG* this, PlayState* play);
ActorInit Bg_Haka_MeganeBG_InitVars = {
ACTOR_BG_HAKA_MEGANEBG,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJECTS,
sizeof(BgHakaMeganeBG),
(ActorFunc)BgHakaMeganeBG_Init,
(ActorFunc)BgHakaMeganeBG_Destroy,
(ActorFunc)BgHakaMeganeBG_Update,
(ActorFunc)BgHakaMeganeBG_Draw,
/**/ ACTOR_BG_HAKA_MEGANEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJECTS,
/**/ sizeof(BgHakaMeganeBG),
/**/ BgHakaMeganeBG_Init,
/**/ BgHakaMeganeBG_Destroy,
/**/ BgHakaMeganeBG_Update,
/**/ BgHakaMeganeBG_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
View file

@ -27,15 +27,15 @@ void BgHakaSgami_SetupSpin(BgHakaSgami* this, PlayState* play);
void BgHakaSgami_Spin(BgHakaSgami* this, PlayState* play);
ActorInit Bg_Haka_Sgami_InitVars = {
ACTOR_BG_HAKA_SGAMI,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgHakaSgami),
(ActorFunc)BgHakaSgami_Init,
(ActorFunc)BgHakaSgami_Destroy,
(ActorFunc)BgHakaSgami_Update,
NULL,
/**/ ACTOR_BG_HAKA_SGAMI,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgHakaSgami),
/**/ BgHakaSgami_Init,
/**/ BgHakaSgami_Destroy,
/**/ BgHakaSgami_Update,
/**/ NULL,
};
static ColliderTrisElementInit sTrisElementsInit[4] = {

18
src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
View file

@ -22,15 +22,15 @@ void BgHakaShip_CrashShake(BgHakaShip* this, PlayState* play);
void BgHakaShip_CrashFall(BgHakaShip* this, PlayState* play);
ActorInit Bg_Haka_Ship_InitVars = {
ACTOR_BG_HAKA_SHIP,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJECTS,
sizeof(BgHakaShip),
(ActorFunc)BgHakaShip_Init,
(ActorFunc)BgHakaShip_Destroy,
(ActorFunc)BgHakaShip_Update,
(ActorFunc)BgHakaShip_Draw,
/**/ ACTOR_BG_HAKA_SHIP,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJECTS,
/**/ sizeof(BgHakaShip),
/**/ BgHakaShip_Init,
/**/ BgHakaShip_Destroy,
/**/ BgHakaShip_Update,
/**/ BgHakaShip_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View file

@ -30,15 +30,15 @@ void func_80880D68(BgHakaTrap* this);
static UNK_TYPE D_80880F30 = 0;
ActorInit Bg_Haka_Trap_InitVars = {
ACTOR_BG_HAKA_TRAP,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJECTS,
sizeof(BgHakaTrap),
(ActorFunc)BgHakaTrap_Init,
(ActorFunc)BgHakaTrap_Destroy,
(ActorFunc)BgHakaTrap_Update,
(ActorFunc)BgHakaTrap_Draw,
/**/ ACTOR_BG_HAKA_TRAP,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJECTS,
/**/ sizeof(BgHakaTrap),
/**/ BgHakaTrap_Init,
/**/ BgHakaTrap_Destroy,
/**/ BgHakaTrap_Update,
/**/ BgHakaTrap_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View file

@ -19,15 +19,15 @@ void BgHakaTubo_Idle(BgHakaTubo* this, PlayState* play);
void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play);
ActorInit Bg_Haka_Tubo_InitVars = {
ACTOR_BG_HAKA_TUBO,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJECTS,
sizeof(BgHakaTubo),
(ActorFunc)BgHakaTubo_Init,
(ActorFunc)BgHakaTubo_Destroy,
(ActorFunc)BgHakaTubo_Update,
(ActorFunc)BgHakaTubo_Draw,
/**/ ACTOR_BG_HAKA_TUBO,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJECTS,
/**/ sizeof(BgHakaTubo),
/**/ BgHakaTubo_Init,
/**/ BgHakaTubo_Destroy,
/**/ BgHakaTubo_Update,
/**/ BgHakaTubo_Draw,
};
static ColliderCylinderInit sPotColliderInit = {

18
src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
View file

@ -19,15 +19,15 @@ void BgHakaWater_Wait(BgHakaWater* this, PlayState* play);
void BgHakaWater_ChangeWaterLevel(BgHakaWater* this, PlayState* play);
ActorInit Bg_Haka_Water_InitVars = {
ACTOR_BG_HAKA_WATER,
ACTORCAT_PROP,
FLAGS,
OBJECT_HAKACH_OBJECTS,
sizeof(BgHakaWater),
(ActorFunc)BgHakaWater_Init,
(ActorFunc)BgHakaWater_Destroy,
(ActorFunc)BgHakaWater_Update,
(ActorFunc)BgHakaWater_Draw,
/**/ ACTOR_BG_HAKA_WATER,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_HAKACH_OBJECTS,
/**/ sizeof(BgHakaWater),
/**/ BgHakaWater_Init,
/**/ BgHakaWater_Destroy,
/**/ BgHakaWater_Update,
/**/ BgHakaWater_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
View file

@ -55,15 +55,15 @@ static ColliderCylinderInit sCylinderInit = {
static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
ActorInit Bg_Haka_Zou_InitVars = {
ACTOR_BG_HAKA_ZOU,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgHakaZou),
(ActorFunc)BgHakaZou_Init,
(ActorFunc)BgHakaZou_Destroy,
(ActorFunc)BgHakaZou_Update,
NULL,
/**/ ACTOR_BG_HAKA_ZOU,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgHakaZou),
/**/ BgHakaZou_Init,
/**/ BgHakaZou_Destroy,
/**/ BgHakaZou_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
View file

@ -28,15 +28,15 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play);
void BgHeavyBlock_DoNothing(BgHeavyBlock* this, PlayState* play);
ActorInit Bg_Heavy_Block_InitVars = {
ACTOR_BG_HEAVY_BLOCK,
ACTORCAT_BG,
FLAGS,
OBJECT_HEAVY_OBJECT,
sizeof(BgHeavyBlock),
(ActorFunc)BgHeavyBlock_Init,
(ActorFunc)BgHeavyBlock_Destroy,
(ActorFunc)BgHeavyBlock_Update,
(ActorFunc)BgHeavyBlock_Draw,
/**/ ACTOR_BG_HEAVY_BLOCK,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HEAVY_OBJECT,
/**/ sizeof(BgHeavyBlock),
/**/ BgHeavyBlock_Init,
/**/ BgHeavyBlock_Destroy,
/**/ BgHeavyBlock_Update,
/**/ BgHeavyBlock_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View file

@ -54,15 +54,15 @@ static CollisionCheckInfoInit sCcInfoInit = { 1, 80, 100, MASS_IMMOVABLE };
static BgHidanCurtainParams sHCParams[] = { { 81, 144, 0.090f, 144.0f, 5.0f }, { 46, 88, 0.055f, 88.0f, 3.0f } };
ActorInit Bg_Hidan_Curtain_InitVars = {
ACTOR_BG_HIDAN_CURTAIN,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgHidanCurtain),
(ActorFunc)BgHidanCurtain_Init,
(ActorFunc)BgHidanCurtain_Destroy,
(ActorFunc)BgHidanCurtain_Update,
(ActorFunc)BgHidanCurtain_Draw,
/**/ ACTOR_BG_HIDAN_CURTAIN,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgHidanCurtain),
/**/ BgHidanCurtain_Init,
/**/ BgHidanCurtain_Destroy,
/**/ BgHidanCurtain_Update,
/**/ BgHidanCurtain_Draw,
};
void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {

18
src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
View file

@ -18,15 +18,15 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play);
void BgHidanDalm_Shrink(BgHidanDalm* this, PlayState* play);
ActorInit Bg_Hidan_Dalm_InitVars = {
ACTOR_BG_HIDAN_DALM,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanDalm),
(ActorFunc)BgHidanDalm_Init,
(ActorFunc)BgHidanDalm_Destroy,
(ActorFunc)BgHidanDalm_Update,
(ActorFunc)BgHidanDalm_Draw,
/**/ ACTOR_BG_HIDAN_DALM,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanDalm),
/**/ BgHidanDalm_Init,
/**/ BgHidanDalm_Destroy,
/**/ BgHidanDalm_Update,
/**/ BgHidanDalm_Draw,
};
static ColliderTrisElementInit sTrisElementInit[4] = {

18
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -22,15 +22,15 @@ void BgHidanFirewall_Collide(BgHidanFirewall* this, PlayState* play);
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, PlayState* play);
ActorInit Bg_Hidan_Firewall_InitVars = {
ACTOR_BG_HIDAN_FIREWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanFirewall),
(ActorFunc)BgHidanFirewall_Init,
(ActorFunc)BgHidanFirewall_Destroy,
(ActorFunc)BgHidanFirewall_Update,
NULL,
/**/ ACTOR_BG_HIDAN_FIREWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanFirewall),
/**/ BgHidanFirewall_Init,
/**/ BgHidanFirewall_Destroy,
/**/ BgHidanFirewall_Update,
/**/ NULL,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
View file

@ -19,15 +19,15 @@ void func_8088706C(BgHidanFslift* this, PlayState* play);
void func_808870D8(BgHidanFslift* this, PlayState* play);
ActorInit Bg_Hidan_Fslift_InitVars = {
ACTOR_BG_HIDAN_FSLIFT,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanFslift),
(ActorFunc)BgHidanFslift_Init,
(ActorFunc)BgHidanFslift_Destroy,
(ActorFunc)BgHidanFslift_Update,
(ActorFunc)BgHidanFslift_Draw,
/**/ ACTOR_BG_HIDAN_FSLIFT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanFslift),
/**/ BgHidanFslift_Init,
/**/ BgHidanFslift_Destroy,
/**/ BgHidanFslift_Update,
/**/ BgHidanFslift_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
View file

@ -32,15 +32,15 @@ void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, PlayState* play);
void BgHidanFwbig_Move(BgHidanFwbig* this, PlayState* play);
ActorInit Bg_Hidan_Fwbig_InitVars = {
ACTOR_BG_HIDAN_FWBIG,
ACTORCAT_PROP,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanFwbig),
(ActorFunc)BgHidanFwbig_Init,
(ActorFunc)BgHidanFwbig_Destroy,
(ActorFunc)BgHidanFwbig_Update,
(ActorFunc)BgHidanFwbig_Draw,
/**/ ACTOR_BG_HIDAN_FWBIG,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanFwbig),
/**/ BgHidanFwbig_Init,
/**/ BgHidanFwbig_Destroy,
/**/ BgHidanFwbig_Update,
/**/ BgHidanFwbig_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View file

@ -64,15 +64,15 @@ static ColliderTrisInit sTrisInit = {
};
ActorInit Bg_Hidan_Hamstep_InitVars = {
ACTOR_BG_HIDAN_HAMSTEP,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanHamstep),
(ActorFunc)BgHidanHamstep_Init,
(ActorFunc)BgHidanHamstep_Destroy,
(ActorFunc)BgHidanHamstep_Update,
(ActorFunc)BgHidanHamstep_Draw,
/**/ ACTOR_BG_HIDAN_HAMSTEP,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanHamstep),
/**/ BgHidanHamstep_Init,
/**/ BgHidanHamstep_Destroy,
/**/ BgHidanHamstep_Update,
/**/ BgHidanHamstep_Draw,
};
static BgHidanHamstepActionFunc sActionFuncs[] = {

18
src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
View file

@ -19,15 +19,15 @@ void func_808896B8(BgHidanHrock* this, PlayState* play);
void func_808894A4(BgHidanHrock* this, PlayState* play);
ActorInit Bg_Hidan_Hrock_InitVars = {
ACTOR_BG_HIDAN_HROCK,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanHrock),
(ActorFunc)BgHidanHrock_Init,
(ActorFunc)BgHidanHrock_Destroy,
(ActorFunc)BgHidanHrock_Update,
(ActorFunc)BgHidanHrock_Draw,
/**/ ACTOR_BG_HIDAN_HROCK,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanHrock),
/**/ BgHidanHrock_Init,
/**/ BgHidanHrock_Destroy,
/**/ BgHidanHrock_Update,
/**/ BgHidanHrock_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[2] = {

18
src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
View file

@ -24,15 +24,15 @@ void func_80889D28(BgHidanKousi* this, PlayState* play);
static f32 D_80889E40[] = { 120.0f, 150.0f, 150.0f };
ActorInit Bg_Hidan_Kousi_InitVars = {
ACTOR_BG_HIDAN_KOUSI,
ACTORCAT_PROP,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanKousi),
(ActorFunc)BgHidanKousi_Init,
(ActorFunc)BgHidanKousi_Destroy,
(ActorFunc)BgHidanKousi_Update,
(ActorFunc)BgHidanKousi_Draw,
/**/ ACTOR_BG_HIDAN_KOUSI,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanKousi),
/**/ BgHidanKousi_Init,
/**/ BgHidanKousi_Destroy,
/**/ BgHidanKousi_Update,
/**/ BgHidanKousi_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
View file

@ -23,15 +23,15 @@ void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play);
void BgHidanKowarerukabe_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Hidan_Kowarerukabe_InitVars = {
ACTOR_BG_HIDAN_KOWARERUKABE,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanKowarerukabe),
(ActorFunc)BgHidanKowarerukabe_Init,
(ActorFunc)BgHidanKowarerukabe_Destroy,
(ActorFunc)BgHidanKowarerukabe_Update,
(ActorFunc)BgHidanKowarerukabe_Draw,
/**/ ACTOR_BG_HIDAN_KOWARERUKABE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanKowarerukabe),
/**/ BgHidanKowarerukabe_Init,
/**/ BgHidanKowarerukabe_Destroy,
/**/ BgHidanKowarerukabe_Update,
/**/ BgHidanKowarerukabe_Draw,
};
static Gfx* sBreakableWallDLists[] = {

18
src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
View file

@ -30,15 +30,15 @@ void func_8088BC40(PlayState* play, BgHidanRock* this);
static Vec3f D_8088BF60 = { 3310.0f, 120.0f, 0.0f };
ActorInit Bg_Hidan_Rock_InitVars = {
ACTOR_BG_HIDAN_ROCK,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanRock),
(ActorFunc)BgHidanRock_Init,
(ActorFunc)BgHidanRock_Destroy,
(ActorFunc)BgHidanRock_Update,
(ActorFunc)BgHidanRock_Draw,
/**/ ACTOR_BG_HIDAN_ROCK,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanRock),
/**/ BgHidanRock_Init,
/**/ BgHidanRock_Destroy,
/**/ BgHidanRock_Update,
/**/ BgHidanRock_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View file

@ -15,15 +15,15 @@ void BgHidanRsekizou_Update(Actor* thisx, PlayState* play);
void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Hidan_Rsekizou_InitVars = {
ACTOR_BG_HIDAN_RSEKIZOU,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanRsekizou),
(ActorFunc)BgHidanRsekizou_Init,
(ActorFunc)BgHidanRsekizou_Destroy,
(ActorFunc)BgHidanRsekizou_Update,
(ActorFunc)BgHidanRsekizou_Draw,
/**/ ACTOR_BG_HIDAN_RSEKIZOU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanRsekizou),
/**/ BgHidanRsekizou_Init,
/**/ BgHidanRsekizou_Destroy,
/**/ BgHidanRsekizou_Update,
/**/ BgHidanRsekizou_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[6] = {

18
src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View file

@ -18,15 +18,15 @@ void func_8088D434(BgHidanSekizou* this, PlayState* play);
void func_8088D720(BgHidanSekizou* this, PlayState* play);
ActorInit Bg_Hidan_Sekizou_InitVars = {
ACTOR_BG_HIDAN_SEKIZOU,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanSekizou),
(ActorFunc)BgHidanSekizou_Init,
(ActorFunc)BgHidanSekizou_Destroy,
(ActorFunc)BgHidanSekizou_Update,
(ActorFunc)BgHidanSekizou_Draw,
/**/ ACTOR_BG_HIDAN_SEKIZOU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanSekizou),
/**/ BgHidanSekizou_Init,
/**/ BgHidanSekizou_Destroy,
/**/ BgHidanSekizou_Update,
/**/ BgHidanSekizou_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[6] = {

18
src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View file

@ -22,15 +22,15 @@ void func_8088E7A8(BgHidanSima* this, PlayState* play);
void func_8088E90C(BgHidanSima* this);
ActorInit Bg_Hidan_Sima_InitVars = {
ACTOR_BG_HIDAN_SIMA,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanSima),
(ActorFunc)BgHidanSima_Init,
(ActorFunc)BgHidanSima_Destroy,
(ActorFunc)BgHidanSima_Update,
(ActorFunc)BgHidanSima_Draw,
/**/ ACTOR_BG_HIDAN_SIMA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanSima),
/**/ BgHidanSima_Init,
/**/ BgHidanSima_Destroy,
/**/ BgHidanSima_Update,
/**/ BgHidanSima_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[2] = {

18
src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
View file

@ -19,15 +19,15 @@ void func_8088F514(BgHidanSyoku* this, PlayState* play);
void func_8088F62C(BgHidanSyoku* this, PlayState* play);
ActorInit Bg_Hidan_Syoku_InitVars = {
ACTOR_BG_HIDAN_SYOKU,
ACTORCAT_BG,
FLAGS,
OBJECT_HIDAN_OBJECTS,
sizeof(BgHidanSyoku),
(ActorFunc)BgHidanSyoku_Init,
(ActorFunc)BgHidanSyoku_Destroy,
(ActorFunc)BgHidanSyoku_Update,
(ActorFunc)BgHidanSyoku_Draw,
/**/ ACTOR_BG_HIDAN_SYOKU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HIDAN_OBJECTS,
/**/ sizeof(BgHidanSyoku),
/**/ BgHidanSyoku_Init,
/**/ BgHidanSyoku_Destroy,
/**/ BgHidanSyoku_Update,
/**/ BgHidanSyoku_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
View file

@ -24,15 +24,15 @@ static Color_RGBA8 sGray = { 180, 180, 180, 255 };
static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
ActorInit Bg_Ice_Objects_InitVars = {
ACTOR_BG_ICE_OBJECTS,
ACTORCAT_PROP,
FLAGS,
OBJECT_ICE_OBJECTS,
sizeof(BgIceObjects),
(ActorFunc)BgIceObjects_Init,
(ActorFunc)BgIceObjects_Destroy,
(ActorFunc)BgIceObjects_Update,
(ActorFunc)BgIceObjects_Draw,
/**/ ACTOR_BG_ICE_OBJECTS,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_ICE_OBJECTS,
/**/ sizeof(BgIceObjects),
/**/ BgIceObjects_Init,
/**/ BgIceObjects_Destroy,
/**/ BgIceObjects_Update,
/**/ BgIceObjects_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
View file

@ -24,15 +24,15 @@ void BgIceShelter_Idle(BgIceShelter* this, PlayState* play);
void BgIceShelter_Melt(BgIceShelter* this, PlayState* play);
ActorInit Bg_Ice_Shelter_InitVars = {
ACTOR_BG_ICE_SHELTER,
ACTORCAT_BG,
FLAGS,
OBJECT_ICE_OBJECTS,
sizeof(BgIceShelter),
(ActorFunc)BgIceShelter_Init,
(ActorFunc)BgIceShelter_Destroy,
(ActorFunc)BgIceShelter_Update,
(ActorFunc)BgIceShelter_Draw,
/**/ ACTOR_BG_ICE_SHELTER,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_ICE_OBJECTS,
/**/ sizeof(BgIceShelter),
/**/ BgIceShelter_Init,
/**/ BgIceShelter_Destroy,
/**/ BgIceShelter_Update,
/**/ BgIceShelter_Draw,
};
static f32 sRedIceScales[] = { 0.1f, 0.06f, 0.1f, 0.1f, 0.25f };

18
src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
View file

@ -19,15 +19,15 @@ void func_80891D6C(BgIceShutter* this, PlayState* play);
void func_80891DD4(BgIceShutter* this, PlayState* play);
ActorInit Bg_Ice_Shutter_InitVars = {
ACTOR_BG_ICE_SHUTTER,
ACTORCAT_PROP,
FLAGS,
OBJECT_ICE_OBJECTS,
sizeof(BgIceShutter),
(ActorFunc)BgIceShutter_Init,
(ActorFunc)BgIceShutter_Destroy,
(ActorFunc)BgIceShutter_Update,
(ActorFunc)BgIceShutter_Draw,
/**/ ACTOR_BG_ICE_SHUTTER,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_ICE_OBJECTS,
/**/ sizeof(BgIceShutter),
/**/ BgIceShutter_Init,
/**/ BgIceShutter_Destroy,
/**/ BgIceShutter_Update,
/**/ BgIceShutter_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
View file

@ -41,15 +41,15 @@ static ColliderCylinderInit sCylinderInit = {
};
ActorInit Bg_Ice_Turara_InitVars = {
ACTOR_BG_ICE_TURARA,
ACTORCAT_PROP,
FLAGS,
OBJECT_ICE_OBJECTS,
sizeof(BgIceTurara),
(ActorFunc)BgIceTurara_Init,
(ActorFunc)BgIceTurara_Destroy,
(ActorFunc)BgIceTurara_Update,
(ActorFunc)BgIceTurara_Draw,
/**/ ACTOR_BG_ICE_TURARA,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_ICE_OBJECTS,
/**/ sizeof(BgIceTurara),
/**/ BgIceTurara_Init,
/**/ BgIceTurara_Destroy,
/**/ BgIceTurara_Update,
/**/ BgIceTurara_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View file

@ -18,15 +18,15 @@ void func_80892890(BgInGate* this, PlayState* play);
void BgInGate_DoNothing(BgInGate* this, PlayState* play);
ActorInit Bg_Ingate_InitVars = {
ACTOR_BG_INGATE,
ACTORCAT_PROP,
FLAGS,
OBJECT_INGATE,
sizeof(BgInGate),
(ActorFunc)BgInGate_Init,
(ActorFunc)BgInGate_Destroy,
(ActorFunc)BgInGate_Update,
(ActorFunc)BgInGate_Draw,
/**/ ACTOR_BG_INGATE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_INGATE,
/**/ sizeof(BgInGate),
/**/ BgInGate_Init,
/**/ BgInGate_Destroy,
/**/ BgInGate_Update,
/**/ BgInGate_Draw,
};
void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) {

18
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
View file

@ -26,15 +26,15 @@ void BgJya1flift_DelayMove(BgJya1flift* this, PlayState* play);
static u8 sIsSpawned = false;
ActorInit Bg_Jya_1flift_InitVars = {
ACTOR_BG_JYA_1FLIFT,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJya1flift),
(ActorFunc)BgJya1flift_Init,
(ActorFunc)BgJya1flift_Destroy,
(ActorFunc)BgJya1flift_Update,
(ActorFunc)BgJya1flift_Draw,
/**/ ACTOR_BG_JYA_1FLIFT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJya1flift),
/**/ BgJya1flift_Init,
/**/ BgJya1flift_Destroy,
/**/ BgJya1flift_Update,
/**/ BgJya1flift_Draw,
};
static ColliderCylinderInit sCylinderInit = {

18
src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
View file

@ -24,15 +24,15 @@ void func_808934FC(BgJyaAmishutter* this);
void func_8089350C(BgJyaAmishutter* this);
ActorInit Bg_Jya_Amishutter_InitVars = {
ACTOR_BG_JYA_AMISHUTTER,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaAmishutter),
(ActorFunc)BgJyaAmishutter_Init,
(ActorFunc)BgJyaAmishutter_Destroy,
(ActorFunc)BgJyaAmishutter_Update,
(ActorFunc)BgJyaAmishutter_Draw,
/**/ ACTOR_BG_JYA_AMISHUTTER,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaAmishutter),
/**/ BgJyaAmishutter_Init,
/**/ BgJyaAmishutter_Destroy,
/**/ BgJyaAmishutter_Update,
/**/ BgJyaAmishutter_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
View file

@ -17,15 +17,15 @@ void BgJyaBigmirror_Draw(Actor* thisx, PlayState* play);
static u8 sIsSpawned = false;
ActorInit Bg_Jya_Bigmirror_InitVars = {
ACTOR_BG_JYA_BIGMIRROR,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaBigmirror),
(ActorFunc)BgJyaBigmirror_Init,
(ActorFunc)BgJyaBigmirror_Destroy,
(ActorFunc)BgJyaBigmirror_Update,
(ActorFunc)BgJyaBigmirror_Draw,
/**/ ACTOR_BG_JYA_BIGMIRROR,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaBigmirror),
/**/ BgJyaBigmirror_Init,
/**/ BgJyaBigmirror_Destroy,
/**/ BgJyaBigmirror_Update,
/**/ BgJyaBigmirror_Draw,
};
typedef struct {

18
src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
View file

@ -15,15 +15,15 @@ void BgJyaBlock_Update(Actor* thisx, PlayState* play);
void BgJyaBlock_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Jya_Block_InitVars = {
ACTOR_BG_JYA_BLOCK,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_DANGEON_KEEP,
sizeof(BgJyaBlock),
(ActorFunc)BgJyaBlock_Init,
(ActorFunc)BgJyaBlock_Destroy,
(ActorFunc)BgJyaBlock_Update,
(ActorFunc)BgJyaBlock_Draw,
/**/ ACTOR_BG_JYA_BLOCK,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_DANGEON_KEEP,
/**/ sizeof(BgJyaBlock),
/**/ BgJyaBlock_Init,
/**/ BgJyaBlock_Destroy,
/**/ BgJyaBlock_Update,
/**/ BgJyaBlock_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
View file

@ -15,15 +15,15 @@ void BgJyaBombchuiwa_CleanUpAfterExplosion(BgJyaBombchuiwa* this, PlayState* pla
void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play);
ActorInit Bg_Jya_Bombchuiwa_InitVars = {
ACTOR_BG_JYA_BOMBCHUIWA,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaBombchuiwa),
(ActorFunc)BgJyaBombchuiwa_Init,
(ActorFunc)BgJyaBombchuiwa_Destroy,
(ActorFunc)BgJyaBombchuiwa_Update,
(ActorFunc)BgJyaBombchuiwa_Draw,
/**/ ACTOR_BG_JYA_BOMBCHUIWA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaBombchuiwa),
/**/ BgJyaBombchuiwa_Init,
/**/ BgJyaBombchuiwa_Destroy,
/**/ BgJyaBombchuiwa_Update,
/**/ BgJyaBombchuiwa_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[1] = {

18
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View file

@ -17,15 +17,15 @@ void BgJyaBombiwa_Update(Actor* thisx, PlayState* play);
void BgJyaBombiwa_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Jya_Bombiwa_InitVars = {
ACTOR_BG_JYA_BOMBIWA,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaBombiwa),
(ActorFunc)BgJyaBombiwa_Init,
(ActorFunc)BgJyaBombiwa_Destroy,
(ActorFunc)BgJyaBombiwa_Update,
(ActorFunc)BgJyaBombiwa_Draw,
/**/ ACTOR_BG_JYA_BOMBIWA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaBombiwa),
/**/ BgJyaBombiwa_Init,
/**/ BgJyaBombiwa_Destroy,
/**/ BgJyaBombiwa_Update,
/**/ BgJyaBombiwa_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[] = {

18
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View file

@ -19,15 +19,15 @@ void func_80896ABC(BgJyaCobra* this, PlayState* play);
#include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c"
ActorInit Bg_Jya_Cobra_InitVars = {
ACTOR_BG_JYA_COBRA,
ACTORCAT_PROP,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaCobra),
(ActorFunc)BgJyaCobra_Init,
(ActorFunc)BgJyaCobra_Destroy,
(ActorFunc)BgJyaCobra_Update,
(ActorFunc)BgJyaCobra_Draw,
/**/ ACTOR_BG_JYA_COBRA,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaCobra),
/**/ BgJyaCobra_Init,
/**/ BgJyaCobra_Destroy,
/**/ BgJyaCobra_Update,
/**/ BgJyaCobra_Draw,
};
static s16 D_80897308[] = { 0, 0, 0, 0 };

18
src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
View file

@ -24,15 +24,15 @@ void BgJyaGoroiwa_UpdateRotation(BgJyaGoroiwa* this);
void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this);
ActorInit Bg_Jya_Goroiwa_InitVars = {
ACTOR_BG_JYA_GOROIWA,
ACTORCAT_PROP,
FLAGS,
OBJECT_GOROIWA,
sizeof(BgJyaGoroiwa),
(ActorFunc)BgJyaGoroiwa_Init,
(ActorFunc)BgJyaGoroiwa_Destroy,
(ActorFunc)BgJyaGoroiwa_Update,
(ActorFunc)BgJyaGoroiwa_Draw,
/**/ ACTOR_BG_JYA_GOROIWA,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_GOROIWA,
/**/ sizeof(BgJyaGoroiwa),
/**/ BgJyaGoroiwa_Init,
/**/ BgJyaGoroiwa_Destroy,
/**/ BgJyaGoroiwa_Update,
/**/ BgJyaGoroiwa_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[] = {

18
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
View file

@ -23,15 +23,15 @@ void BgJyaHaheniron_SetupRubbleCollide(BgJyaHaheniron* this);
void BgJyaHaheniron_RubbleCollide(BgJyaHaheniron* this, PlayState* play);
ActorInit Bg_Jya_Haheniron_InitVars = {
ACTOR_BG_JYA_HAHENIRON,
ACTORCAT_PROP,
FLAGS,
OBJECT_JYA_IRON,
sizeof(BgJyaHaheniron),
(ActorFunc)BgJyaHaheniron_Init,
(ActorFunc)BgJyaHaheniron_Destroy,
(ActorFunc)BgJyaHaheniron_Update,
(ActorFunc)BgJyaHaheniron_Draw,
/**/ ACTOR_BG_JYA_HAHENIRON,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_JYA_IRON,
/**/ sizeof(BgJyaHaheniron),
/**/ BgJyaHaheniron_Init,
/**/ BgJyaHaheniron_Destroy,
/**/ BgJyaHaheniron_Update,
/**/ BgJyaHaheniron_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[1] = {

18
src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
View file

@ -25,15 +25,15 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk
static int sUnused = 0;
ActorInit Bg_Jya_Ironobj_InitVars = {
ACTOR_BG_JYA_IRONOBJ,
ACTORCAT_PROP,
FLAGS,
OBJECT_JYA_IRON,
sizeof(BgJyaIronobj),
(ActorFunc)BgJyaIronobj_Init,
(ActorFunc)BgJyaIronobj_Destroy,
(ActorFunc)BgJyaIronobj_Update,
(ActorFunc)BgJyaIronobj_Draw,
/**/ ACTOR_BG_JYA_IRONOBJ,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_JYA_IRON,
/**/ sizeof(BgJyaIronobj),
/**/ BgJyaIronobj_Init,
/**/ BgJyaIronobj_Destroy,
/**/ BgJyaIronobj_Update,
/**/ BgJyaIronobj_Draw,
};
static Gfx* sOpaDL[] = { gPillarDL, gThroneDL };

18
src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
View file

@ -22,15 +22,15 @@ void func_80899950(BgJyaKanaami* this, PlayState* play);
void func_80899A08(BgJyaKanaami* this);
ActorInit Bg_Jya_Kanaami_InitVars = {
ACTOR_BG_JYA_KANAAMI,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaKanaami),
(ActorFunc)BgJyaKanaami_Init,
(ActorFunc)BgJyaKanaami_Destroy,
(ActorFunc)BgJyaKanaami_Update,
(ActorFunc)BgJyaKanaami_Draw,
/**/ ACTOR_BG_JYA_KANAAMI,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaKanaami),
/**/ BgJyaKanaami_Init,
/**/ BgJyaKanaami_Destroy,
/**/ BgJyaKanaami_Update,
/**/ BgJyaKanaami_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
View file

@ -23,15 +23,15 @@ void BgJyaLift_Move(BgJyaLift* this, PlayState* play);
static s16 sIsSpawned = false;
ActorInit Bg_Jya_Lift_InitVars = {
ACTOR_BG_JYA_LIFT,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaLift),
(ActorFunc)BgJyaLift_Init,
(ActorFunc)BgJyaLift_Destroy,
(ActorFunc)BgJyaLift_Update,
(ActorFunc)BgJyaLift_Draw,
/**/ ACTOR_BG_JYA_LIFT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaLift),
/**/ BgJyaLift_Init,
/**/ BgJyaLift_Destroy,
/**/ BgJyaLift_Update,
/**/ BgJyaLift_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View file

@ -21,15 +21,15 @@ void BgJyaMegami_SetupExplode(BgJyaMegami* this);
void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play);
ActorInit Bg_Jya_Megami_InitVars = {
ACTOR_BG_JYA_MEGAMI,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaMegami),
(ActorFunc)BgJyaMegami_Init,
(ActorFunc)BgJyaMegami_Destroy,
(ActorFunc)BgJyaMegami_Update,
(ActorFunc)BgJyaMegami_Draw,
/**/ ACTOR_BG_JYA_MEGAMI,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaMegami),
/**/ BgJyaMegami_Init,
/**/ BgJyaMegami_Destroy,
/**/ BgJyaMegami_Update,
/**/ BgJyaMegami_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[] = {

18
src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
View file

@ -24,15 +24,15 @@ void func_8089B870(BgJyaZurerukabe* this, PlayState* play);
static f32 D_8089B9C0[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
ActorInit Bg_Jya_Zurerukabe_InitVars = {
ACTOR_BG_JYA_ZURERUKABE,
ACTORCAT_BG,
FLAGS,
OBJECT_JYA_OBJ,
sizeof(BgJyaZurerukabe),
(ActorFunc)BgJyaZurerukabe_Init,
(ActorFunc)BgJyaZurerukabe_Destroy,
(ActorFunc)BgJyaZurerukabe_Update,
(ActorFunc)BgJyaZurerukabe_Draw,
/**/ ACTOR_BG_JYA_ZURERUKABE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_JYA_OBJ,
/**/ sizeof(BgJyaZurerukabe),
/**/ BgJyaZurerukabe_Init,
/**/ BgJyaZurerukabe_Destroy,
/**/ BgJyaZurerukabe_Update,
/**/ BgJyaZurerukabe_Draw,
};
static s16 D_8089B9F0[4] = { 943, 1043, 1243, 1343 };

18
src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
View file

@ -15,15 +15,15 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play);
void BgMenkuriEye_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Menkuri_Eye_InitVars = {
ACTOR_BG_MENKURI_EYE,
ACTORCAT_BG,
FLAGS,
OBJECT_MENKURI_OBJECTS,
sizeof(BgMenkuriEye),
(ActorFunc)BgMenkuriEye_Init,
(ActorFunc)BgMenkuriEye_Destroy,
(ActorFunc)BgMenkuriEye_Update,
(ActorFunc)BgMenkuriEye_Draw,
/**/ ACTOR_BG_MENKURI_EYE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MENKURI_OBJECTS,
/**/ sizeof(BgMenkuriEye),
/**/ BgMenkuriEye_Init,
/**/ BgMenkuriEye_Destroy,
/**/ BgMenkuriEye_Update,
/**/ BgMenkuriEye_Draw,
};
static s32 D_8089C1A0;

18
src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
View file

@ -15,15 +15,15 @@ void BgMenkuriKaiten_Update(Actor* thisx, PlayState* play);
void BgMenkuriKaiten_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Menkuri_Kaiten_InitVars = {
ACTOR_BG_MENKURI_KAITEN,
ACTORCAT_BG,
FLAGS,
OBJECT_MENKURI_OBJECTS,
sizeof(BgMenkuriKaiten),
(ActorFunc)BgMenkuriKaiten_Init,
(ActorFunc)BgMenkuriKaiten_Destroy,
(ActorFunc)BgMenkuriKaiten_Update,
(ActorFunc)BgMenkuriKaiten_Draw,
/**/ ACTOR_BG_MENKURI_KAITEN,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MENKURI_OBJECTS,
/**/ sizeof(BgMenkuriKaiten),
/**/ BgMenkuriKaiten_Init,
/**/ BgMenkuriKaiten_Destroy,
/**/ BgMenkuriKaiten_Update,
/**/ BgMenkuriKaiten_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
View file

@ -15,15 +15,15 @@ void BgMenkuriNisekabe_Update(Actor* thisx, PlayState* play);
void BgMenkuriNisekabe_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Menkuri_Nisekabe_InitVars = {
ACTOR_BG_MENKURI_NISEKABE,
ACTORCAT_PROP,
FLAGS,
OBJECT_MENKURI_OBJECTS,
sizeof(BgMenkuriNisekabe),
(ActorFunc)BgMenkuriNisekabe_Init,
(ActorFunc)BgMenkuriNisekabe_Destroy,
(ActorFunc)BgMenkuriNisekabe_Update,
(ActorFunc)BgMenkuriNisekabe_Draw,
/**/ ACTOR_BG_MENKURI_NISEKABE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_MENKURI_OBJECTS,
/**/ sizeof(BgMenkuriNisekabe),
/**/ BgMenkuriNisekabe_Init,
/**/ BgMenkuriNisekabe_Destroy,
/**/ BgMenkuriNisekabe_Update,
/**/ BgMenkuriNisekabe_Draw,
};
static Gfx* sDLists[] = { gGTGFakeWallDL, gGTGFakeCeilingDL };

18
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View file

@ -20,15 +20,15 @@ void BgMizuBwall_Break(BgMizuBwall* this, PlayState* play);
void BgMizuBwall_DoNothing(BgMizuBwall* this, PlayState* play);
ActorInit Bg_Mizu_Bwall_InitVars = {
ACTOR_BG_MIZU_BWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_MIZU_OBJECTS,
sizeof(BgMizuBwall),
(ActorFunc)BgMizuBwall_Init,
(ActorFunc)BgMizuBwall_Destroy,
(ActorFunc)BgMizuBwall_Update,
(ActorFunc)BgMizuBwall_Draw,
/**/ ACTOR_BG_MIZU_BWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MIZU_OBJECTS,
/**/ sizeof(BgMizuBwall),
/**/ BgMizuBwall_Init,
/**/ BgMizuBwall_Destroy,
/**/ BgMizuBwall_Update,
/**/ BgMizuBwall_Draw,
};
static ColliderTrisElementInit sTrisElementInitFloor[2] = {

18
src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View file

@ -26,15 +26,15 @@ void func_8089E650(BgMizuMovebg* this, PlayState* play);
s32 func_8089E108(Path* pathList, Vec3f* pos, s32 pathId, s32 pointId);
ActorInit Bg_Mizu_Movebg_InitVars = {
ACTOR_BG_MIZU_MOVEBG,
ACTORCAT_BG,
FLAGS,
OBJECT_MIZU_OBJECTS,
sizeof(BgMizuMovebg),
(ActorFunc)BgMizuMovebg_Init,
(ActorFunc)BgMizuMovebg_Destroy,
(ActorFunc)BgMizuMovebg_Update,
(ActorFunc)BgMizuMovebg_Draw,
/**/ ACTOR_BG_MIZU_MOVEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MIZU_OBJECTS,
/**/ sizeof(BgMizuMovebg),
/**/ BgMizuMovebg_Init,
/**/ BgMizuMovebg_Destroy,
/**/ BgMizuMovebg_Update,
/**/ BgMizuMovebg_Draw,
};
static f32 D_8089EB40[] = { -115.200005f, -115.200005f, -115.200005f, 0.0f };

18
src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
View file

@ -14,15 +14,15 @@ void BgMizuShutter_Move(BgMizuShutter* this, PlayState* play);
void BgMizuShutter_WaitForCutscene(BgMizuShutter* this, PlayState* play);
ActorInit Bg_Mizu_Shutter_InitVars = {
ACTOR_BG_MIZU_SHUTTER,
ACTORCAT_PROP,
FLAGS,
OBJECT_MIZU_OBJECTS,
sizeof(BgMizuShutter),
(ActorFunc)BgMizuShutter_Init,
(ActorFunc)BgMizuShutter_Destroy,
(ActorFunc)BgMizuShutter_Update,
(ActorFunc)BgMizuShutter_Draw,
/**/ ACTOR_BG_MIZU_SHUTTER,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_MIZU_OBJECTS,
/**/ sizeof(BgMizuShutter),
/**/ BgMizuShutter_Init,
/**/ BgMizuShutter_Destroy,
/**/ BgMizuShutter_Update,
/**/ BgMizuShutter_Draw,
};
static Gfx* sDisplayLists[] = { gObjectMizuObjectsShutterDL_007130, gObjectMizuObjectsShutterDL_0072D0 };

18
src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c
View file

@ -17,15 +17,15 @@ void BgMizuUzu_Draw(Actor* thisx, PlayState* play);
void func_8089F788(BgMizuUzu* this, PlayState* play);
ActorInit Bg_Mizu_Uzu_InitVars = {
ACTOR_BG_MIZU_UZU,
ACTORCAT_PROP,
FLAGS,
OBJECT_MIZU_OBJECTS,
sizeof(BgMizuUzu),
(ActorFunc)BgMizuUzu_Init,
(ActorFunc)BgMizuUzu_Destroy,
(ActorFunc)BgMizuUzu_Update,
(ActorFunc)BgMizuUzu_Draw,
/**/ ACTOR_BG_MIZU_UZU,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_MIZU_OBJECTS,
/**/ sizeof(BgMizuUzu),
/**/ BgMizuUzu_Init,
/**/ BgMizuUzu_Destroy,
/**/ BgMizuUzu_Update,
/**/ BgMizuUzu_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
View file

@ -30,15 +30,15 @@ static WaterLevel sWaterLevels[] = {
};
ActorInit Bg_Mizu_Water_InitVars = {
ACTOR_BG_MIZU_WATER,
ACTORCAT_BG,
FLAGS,
OBJECT_MIZU_OBJECTS,
sizeof(BgMizuWater),
(ActorFunc)BgMizuWater_Init,
(ActorFunc)BgMizuWater_Destroy,
(ActorFunc)BgMizuWater_Update,
(ActorFunc)BgMizuWater_Draw,
/**/ ACTOR_BG_MIZU_WATER,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MIZU_OBJECTS,
/**/ sizeof(BgMizuWater),
/**/ BgMizuWater_Init,
/**/ BgMizuWater_Destroy,
/**/ BgMizuWater_Update,
/**/ BgMizuWater_Draw,
};
static f32 sUnused1 = 0;

18
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View file

@ -25,15 +25,15 @@ void func_808A0850(BgMjin* this, PlayState* play);
void BgMjin_DoNothing(BgMjin* this, PlayState* play);
ActorInit Bg_Mjin_InitVars = {
ACTOR_BG_MJIN,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgMjin),
(ActorFunc)BgMjin_Init,
(ActorFunc)BgMjin_Destroy,
(ActorFunc)BgMjin_Update,
NULL,
/**/ ACTOR_BG_MJIN,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgMjin),
/**/ BgMjin_Init,
/**/ BgMjin_Destroy,
/**/ BgMjin_Update,
/**/ NULL,
};
extern UNK_TYPE D_06000000;

18
src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
View file

@ -29,15 +29,15 @@ void BgMoriBigst_StalfosPairFight(BgMoriBigst* this, PlayState* play);
void BgMoriBigst_SetupDone(BgMoriBigst* this, PlayState* play);
ActorInit Bg_Mori_Bigst_InitVars = {
ACTOR_BG_MORI_BIGST,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriBigst),
(ActorFunc)BgMoriBigst_Init,
(ActorFunc)BgMoriBigst_Destroy,
(ActorFunc)BgMoriBigst_Update,
NULL,
/**/ ACTOR_BG_MORI_BIGST,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriBigst),
/**/ BgMoriBigst_Init,
/**/ BgMoriBigst_Destroy,
/**/ BgMoriBigst_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
View file

@ -20,15 +20,15 @@ void BgMoriElevator_MoveAboveGround(BgMoriElevator* this, PlayState* play);
static s16 sIsSpawned = false;
ActorInit Bg_Mori_Elevator_InitVars = {
ACTOR_BG_MORI_ELEVATOR,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriElevator),
(ActorFunc)BgMoriElevator_Init,
(ActorFunc)BgMoriElevator_Destroy,
(ActorFunc)BgMoriElevator_Update,
NULL,
/**/ ACTOR_BG_MORI_ELEVATOR,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriElevator),
/**/ BgMoriElevator_Init,
/**/ BgMoriElevator_Destroy,
/**/ BgMoriElevator_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View file

@ -25,15 +25,15 @@ void BgMoriHashigo_LadderFall(BgMoriHashigo* this, PlayState* play);
void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this);
ActorInit Bg_Mori_Hashigo_InitVars = {
ACTOR_BG_MORI_HASHIGO,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriHashigo),
(ActorFunc)BgMoriHashigo_Init,
(ActorFunc)BgMoriHashigo_Destroy,
(ActorFunc)BgMoriHashigo_Update,
NULL,
/**/ ACTOR_BG_MORI_HASHIGO,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriHashigo),
/**/ BgMoriHashigo_Init,
/**/ BgMoriHashigo_Destroy,
/**/ BgMoriHashigo_Update,
/**/ NULL,
};
static ColliderJntSphElementInit sJntSphElementsInit[1] = {

18
src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
View file

@ -22,15 +22,15 @@ void BgMoriHashira4_GateWait(BgMoriHashira4* this, PlayState* play);
void BgMoriHashira4_GateOpen(BgMoriHashira4* this, PlayState* play);
ActorInit Bg_Mori_Hashira4_InitVars = {
ACTOR_BG_MORI_HASHIRA4,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriHashira4),
(ActorFunc)BgMoriHashira4_Init,
(ActorFunc)BgMoriHashira4_Destroy,
(ActorFunc)BgMoriHashira4_Update,
NULL,
/**/ ACTOR_BG_MORI_HASHIRA4,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriHashira4),
/**/ BgMoriHashira4_Init,
/**/ BgMoriHashira4_Destroy,
/**/ BgMoriHashira4_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
View file

@ -30,15 +30,15 @@ void func_808A3D58(BgMoriHineri* this, PlayState* play);
static s16 sSubCamId = CAM_ID_NONE;
ActorInit Bg_Mori_Hineri_InitVars = {
ACTOR_BG_MORI_HINERI,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgMoriHineri),
(ActorFunc)BgMoriHineri_Init,
(ActorFunc)BgMoriHineri_Destroy,
(ActorFunc)BgMoriHineri_Update,
NULL,
/**/ ACTOR_BG_MORI_HINERI,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgMoriHineri),
/**/ BgMoriHineri_Init,
/**/ BgMoriHineri_Destroy,
/**/ BgMoriHineri_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
View file

@ -22,15 +22,15 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play);
static s16 sIsSpawned = false;
ActorInit Bg_Mori_Idomizu_InitVars = {
ACTOR_BG_MORI_IDOMIZU,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriIdomizu),
(ActorFunc)BgMoriIdomizu_Init,
(ActorFunc)BgMoriIdomizu_Destroy,
(ActorFunc)BgMoriIdomizu_Update,
NULL,
/**/ ACTOR_BG_MORI_IDOMIZU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriIdomizu),
/**/ BgMoriIdomizu_Init,
/**/ BgMoriIdomizu_Destroy,
/**/ BgMoriIdomizu_Update,
/**/ NULL,
};
void BgMoriIdomizu_SetupAction(BgMoriIdomizu* this, BgMoriIdomizuActionFunc actionFunc) {

18
src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
View file

@ -21,15 +21,15 @@ void BgMoriKaitenkabe_SetupRotate(BgMoriKaitenkabe* this);
void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play);
ActorInit Bg_Mori_Kaitenkabe_InitVars = {
ACTOR_BG_MORI_KAITENKABE,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriKaitenkabe),
(ActorFunc)BgMoriKaitenkabe_Init,
(ActorFunc)BgMoriKaitenkabe_Destroy,
(ActorFunc)BgMoriKaitenkabe_Update,
NULL,
/**/ ACTOR_BG_MORI_KAITENKABE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriKaitenkabe),
/**/ BgMoriKaitenkabe_Init,
/**/ BgMoriKaitenkabe_Destroy,
/**/ BgMoriKaitenkabe_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
View file

@ -29,15 +29,15 @@ void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, PlayState* play);
static s16 sCamSetting = CAM_SET_NONE;
ActorInit Bg_Mori_Rakkatenjo_InitVars = {
ACTOR_BG_MORI_RAKKATENJO,
ACTORCAT_BG,
FLAGS,
OBJECT_MORI_OBJECTS,
sizeof(BgMoriRakkatenjo),
(ActorFunc)BgMoriRakkatenjo_Init,
(ActorFunc)BgMoriRakkatenjo_Destroy,
(ActorFunc)BgMoriRakkatenjo_Update,
NULL,
/**/ ACTOR_BG_MORI_RAKKATENJO,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MORI_OBJECTS,
/**/ sizeof(BgMoriRakkatenjo),
/**/ BgMoriRakkatenjo_Init,
/**/ BgMoriRakkatenjo_Destroy,
/**/ BgMoriRakkatenjo_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View file

@ -29,15 +29,15 @@ void BgPoEvent_PaintingPresent(BgPoEvent* this, PlayState* play);
void BgPoEvent_PaintingBurn(BgPoEvent* this, PlayState* play);
ActorInit Bg_Po_Event_InitVars = {
ACTOR_BG_PO_EVENT,
ACTORCAT_BG,
FLAGS,
OBJECT_PO_SISTERS,
sizeof(BgPoEvent),
(ActorFunc)BgPoEvent_Init,
(ActorFunc)BgPoEvent_Destroy,
(ActorFunc)BgPoEvent_Update,
(ActorFunc)BgPoEvent_Draw,
/**/ ACTOR_BG_PO_EVENT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_PO_SISTERS,
/**/ sizeof(BgPoEvent),
/**/ BgPoEvent_Init,
/**/ BgPoEvent_Destroy,
/**/ BgPoEvent_Update,
/**/ BgPoEvent_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[2] = {

18
src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
View file

@ -59,15 +59,15 @@ static Color_RGBA8 sEnvColors[] = {
};
ActorInit Bg_Po_Syokudai_InitVars = {
ACTOR_BG_PO_SYOKUDAI,
ACTORCAT_PROP,
FLAGS,
OBJECT_SYOKUDAI,
sizeof(BgPoSyokudai),
(ActorFunc)BgPoSyokudai_Init,
(ActorFunc)BgPoSyokudai_Destroy,
(ActorFunc)BgPoSyokudai_Update,
(ActorFunc)BgPoSyokudai_Draw,
/**/ ACTOR_BG_PO_SYOKUDAI,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_SYOKUDAI,
/**/ sizeof(BgPoSyokudai),
/**/ BgPoSyokudai_Init,
/**/ BgPoSyokudai_Destroy,
/**/ BgPoSyokudai_Update,
/**/ BgPoSyokudai_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -17,16 +17,16 @@ void BgPushbox_Draw(Actor* thisx, PlayState* play);
void BgPushbox_UpdateImpl(BgPushbox* this, PlayState* play);
ActorInit Bg_Pushbox_InitVars = {
ACTOR_BG_PUSHBOX,
ACTORCAT_BG,
FLAGS,
/**/ ACTOR_BG_PUSHBOX,
/**/ ACTORCAT_BG,
/**/ FLAGS,
//! @bug fixing this actor would involve using OBJECT_PU_BOX
OBJECT_GAMEPLAY_DANGEON_KEEP,
sizeof(BgPushbox),
(ActorFunc)BgPushbox_Init,
(ActorFunc)BgPushbox_Destroy,
(ActorFunc)BgPushbox_Update,
(ActorFunc)BgPushbox_Draw,
/**/ OBJECT_GAMEPLAY_DANGEON_KEEP,
/**/ sizeof(BgPushbox),
/**/ BgPushbox_Init,
/**/ BgPushbox_Destroy,
/**/ BgPushbox_Update,
/**/ BgPushbox_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
View file

@ -27,15 +27,15 @@ void func_808A932C(BgRelayObjects* this, PlayState* play);
void func_808A939C(BgRelayObjects* this, PlayState* play);
ActorInit Bg_Relay_Objects_InitVars = {
ACTOR_BG_RELAY_OBJECTS,
ACTORCAT_BG,
FLAGS,
OBJECT_RELAY_OBJECTS,
sizeof(BgRelayObjects),
(ActorFunc)BgRelayObjects_Init,
(ActorFunc)BgRelayObjects_Destroy,
(ActorFunc)BgRelayObjects_Update,
(ActorFunc)BgRelayObjects_Draw,
/**/ ACTOR_BG_RELAY_OBJECTS,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_RELAY_OBJECTS,
/**/ sizeof(BgRelayObjects),
/**/ BgRelayObjects_Init,
/**/ BgRelayObjects_Destroy,
/**/ BgRelayObjects_Update,
/**/ BgRelayObjects_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c
View file

@ -15,15 +15,15 @@ void BgSpot00Break_Update(Actor* thisx, PlayState* play);
void BgSpot00Break_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Spot00_Break_InitVars = {
ACTOR_BG_SPOT00_BREAK,
ACTORCAT_PROP,
FLAGS,
OBJECT_SPOT00_BREAK,
sizeof(BgSpot00Break),
(ActorFunc)BgSpot00Break_Init,
(ActorFunc)BgSpot00Break_Destroy,
(ActorFunc)BgSpot00Break_Update,
(ActorFunc)BgSpot00Break_Draw,
/**/ ACTOR_BG_SPOT00_BREAK,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_SPOT00_BREAK,
/**/ sizeof(BgSpot00Break),
/**/ BgSpot00Break_Init,
/**/ BgSpot00Break_Destroy,
/**/ BgSpot00Break_Update,
/**/ BgSpot00Break_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View file

@ -26,15 +26,15 @@ void BgSpot00Hanebasi_DrawbridgeRiseAndFall(BgSpot00Hanebasi* this, PlayState* p
void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, PlayState* play);
ActorInit Bg_Spot00_Hanebasi_InitVars = {
ACTOR_BG_SPOT00_HANEBASI,
ACTORCAT_BG,
FLAGS,
OBJECT_SPOT00_OBJECTS,
sizeof(BgSpot00Hanebasi),
(ActorFunc)BgSpot00Hanebasi_Init,
(ActorFunc)BgSpot00Hanebasi_Destroy,
(ActorFunc)BgSpot00Hanebasi_Update,
(ActorFunc)BgSpot00Hanebasi_Draw,
/**/ ACTOR_BG_SPOT00_HANEBASI,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SPOT00_OBJECTS,
/**/ sizeof(BgSpot00Hanebasi),
/**/ BgSpot00Hanebasi_Init,
/**/ BgSpot00Hanebasi_Destroy,
/**/ BgSpot00Hanebasi_Update,
/**/ BgSpot00Hanebasi_Draw,
};
static f32 sTorchFlameScale = 0.0f;

18
src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
View file

@ -17,15 +17,15 @@ void BgSpot01Fusya_Draw(Actor* thisx, PlayState* play);
void func_808AAA50(BgSpot01Fusya* this, PlayState* play);
ActorInit Bg_Spot01_Fusya_InitVars = {
ACTOR_BG_SPOT01_FUSYA,
ACTORCAT_BG,
FLAGS,
OBJECT_SPOT01_OBJECTS,
sizeof(BgSpot01Fusya),
(ActorFunc)BgSpot01Fusya_Init,
(ActorFunc)BgSpot01Fusya_Destroy,
(ActorFunc)BgSpot01Fusya_Update,
(ActorFunc)BgSpot01Fusya_Draw,
/**/ ACTOR_BG_SPOT01_FUSYA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SPOT01_OBJECTS,
/**/ sizeof(BgSpot01Fusya),
/**/ BgSpot01Fusya_Init,
/**/ BgSpot01Fusya_Destroy,
/**/ BgSpot01Fusya_Update,
/**/ BgSpot01Fusya_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
View file

@ -37,15 +37,15 @@ static BgSpot01IdohashiraDrawFunc sDrawFuncs[] = {
};
ActorInit Bg_Spot01_Idohashira_InitVars = {
ACTOR_BG_SPOT01_IDOHASHIRA,
ACTORCAT_PROP,
FLAGS,
OBJECT_SPOT01_OBJECTS,
sizeof(BgSpot01Idohashira),
(ActorFunc)BgSpot01Idohashira_Init,
(ActorFunc)BgSpot01Idohashira_Destroy,
(ActorFunc)BgSpot01Idohashira_Update,
(ActorFunc)BgSpot01Idohashira_Draw,
/**/ ACTOR_BG_SPOT01_IDOHASHIRA,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_SPOT01_OBJECTS,
/**/ sizeof(BgSpot01Idohashira),
/**/ BgSpot01Idohashira_Init,
/**/ BgSpot01Idohashira_Destroy,
/**/ BgSpot01Idohashira_Update,
/**/ BgSpot01Idohashira_Draw,
};
void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) {

18
src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
View file

@ -17,15 +17,15 @@ void BgSpot01Idomizu_Draw(Actor* thisx, PlayState* play);
void func_808ABB84(BgSpot01Idomizu* this, PlayState* play);
ActorInit Bg_Spot01_Idomizu_InitVars = {
ACTOR_BG_SPOT01_IDOMIZU,
ACTORCAT_BG,
FLAGS,
OBJECT_SPOT01_OBJECTS,
sizeof(BgSpot01Idomizu),
(ActorFunc)BgSpot01Idomizu_Init,
(ActorFunc)BgSpot01Idomizu_Destroy,
(ActorFunc)BgSpot01Idomizu_Update,
(ActorFunc)BgSpot01Idomizu_Draw,
/**/ ACTOR_BG_SPOT01_IDOMIZU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SPOT01_OBJECTS,
/**/ sizeof(BgSpot01Idomizu),
/**/ BgSpot01Idomizu_Init,
/**/ BgSpot01Idomizu_Destroy,
/**/ BgSpot01Idomizu_Update,
/**/ BgSpot01Idomizu_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
View file

@ -17,15 +17,15 @@ void BgSpot01Idosoko_Draw(Actor* thisx, PlayState* play);
void func_808ABF54(BgSpot01Idosoko* this, PlayState* play);
ActorInit Bg_Spot01_Idosoko_InitVars = {
ACTOR_BG_SPOT01_IDOSOKO,
ACTORCAT_BG,
FLAGS,
OBJECT_SPOT01_MATOYA,
sizeof(BgSpot01Idosoko),
(ActorFunc)BgSpot01Idosoko_Init,
(ActorFunc)BgSpot01Idosoko_Destroy,
(ActorFunc)BgSpot01Idosoko_Update,
(ActorFunc)BgSpot01Idosoko_Draw,
/**/ ACTOR_BG_SPOT01_IDOSOKO,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SPOT01_MATOYA,
/**/ sizeof(BgSpot01Idosoko),
/**/ BgSpot01Idosoko_Init,
/**/ BgSpot01Idosoko_Destroy,
/**/ BgSpot01Idosoko_Update,
/**/ BgSpot01Idosoko_Draw,
};
static InitChainEntry sInitChain[] = {

18
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
View file

@ -19,15 +19,15 @@ void func_808AC474(BgSpot01Objects2* this, PlayState* play);
void func_808AC4A4(Actor* thisx, PlayState* play);
ActorInit Bg_Spot01_Objects2_InitVars = {
ACTOR_BG_SPOT01_OBJECTS2,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(BgSpot01Objects2),
(ActorFunc)BgSpot01Objects2_Init,
(ActorFunc)BgSpot01Objects2_Destroy,
(ActorFunc)BgSpot01Objects2_Update,
NULL,
/**/ ACTOR_BG_SPOT01_OBJECTS2,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_GAMEPLAY_KEEP,
/**/ sizeof(BgSpot01Objects2),
/**/ BgSpot01Objects2_Init,
/**/ BgSpot01Objects2_Destroy,
/**/ BgSpot01Objects2_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {

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