mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-12 11:51:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove (ActorFunc) cast on InitVars (#1148)

Browse Source 
* Remove ActorFunc cast

* Format

* Revert "Format"

This reverts commit a6e89b3969.

* Messing with formatting

* format header a bit

* Revert "Messing with formatting"

This reverts commit c8db520278.

* comment

* format

* more comments

* format

* format

* format

* properly format
This commit is contained in:
Anghelo Carvajal
2023-10-27 10:03:02 -03:00
committed by GitHub
parent 6475196f0f
commit cf41eeb3ac
581 changed files with 5260 additions and 5225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tutorial/advanced_control_flow.md
+9 -9
View File
@@ -27,15 +27,15 @@ void func_809529AC(EnMs* this, PlayState* play);
void func_80952A1C(EnMs* this, PlayState* play);
ActorInit En_Ms_InitVars = {
ACTOR_EN_MS,
ACTORCAT_NPC,
FLAGS,
OBJECT_MS,
sizeof(EnMs),
(ActorFunc)EnMs_Init,
(ActorFunc)EnMs_Destroy,
(ActorFunc)EnMs_Update,
(ActorFunc)EnMs_Draw,
/**/ ACTOR_EN_MS,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_MS,
/**/ sizeof(EnMs),
/**/ EnMs_Init,
/**/ EnMs_Destroy,
/**/ EnMs_Update,
/**/ EnMs_Draw,
};
static ColliderCylinderInitType1 D_80952BA0 = {
docs/tutorial/beginning_decomp.md
+18 -18
View File
@@ -28,15 +28,15 @@ void EnRecepgirl_Draw(Actor* thisx, PlayState* play);
// --------------- 4 ---------------
#if 0
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
/**/ sizeof(EnRecepgirl),
/**/ EnRecepgirl_Init,
/**/ EnRecepgirl_Destroy,
/**/ EnRecepgirl_Update,
/**/ EnRecepgirl_Draw,
};
// static InitChainEntry sInitChain[] = {
@@ -336,15 +336,15 @@ For now, we do not want to consider the data that mips2c has kindly imported for
```C
#if 0
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
/**/ sizeof(EnRecepgirl),
/**/ EnRecepgirl_Init,
/**/ EnRecepgirl_Destroy,
/**/ EnRecepgirl_Update,
/**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
docs/tutorial/data.md
+22 -22
View File
@@ -44,15 +44,15 @@ Once we have decompiled enough things to know what the data is, we can import it
```C
#if 0
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
/**/ sizeof(EnRecepgirl),
/**/ EnRecepgirl_Init,
/**/ EnRecepgirl_Destroy,
/**/ EnRecepgirl_Update,
/**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -100,15 +100,15 @@ Next remove all the externs, and uncomment their corresponding commented data:
```C
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
/**/ sizeof(EnRecepgirl),
/**/ EnRecepgirl_Init,
/**/ EnRecepgirl_Destroy,
/**/ EnRecepgirl_Update,
/**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -140,10 +140,10 @@ For actors which have yet to be decompiled, this is mitigated by use of the file
```c
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
};
```
docs/tutorial/documenting.md
+13 -13
View File
@@ -49,15 +49,15 @@ void func_80C10290(EnRecepgirl* this);
void func_80C102D4(EnRecepgirl* this, PlayState* play);
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
/**/ sizeof(EnRecepgirl),
/**/ EnRecepgirl_Init,
/**/ EnRecepgirl_Destroy,
/**/ EnRecepgirl_Update,
/**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, object_bg_Tex_00FCF0 };
@@ -317,10 +317,10 @@ As we discussed last time, `D_80C106B0` is an array of [segmented pointers](data
```C
ActorInit En_Recepgirl_InitVars = {
ACTOR_EN_RECEPGIRL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BG,
/**/ ACTOR_EN_RECEPGIRL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BG,
```
the fourth element is the object (it is actually an enum, but the file itself has the same name as the object enum). So, we need to look at the object file. We are very lucky that a custom tool has been written for such a thing: Z64Utils.
include/z64actor.h
+2 -4
View File
@@ -23,7 +23,7 @@ struct CollisionPoly;
struct EnBox;
struct EnTorch2;
typedef void(*ActorFunc)(struct Actor* this, struct PlayState* play);
typedef void (*ActorFunc)(struct Actor* this, struct PlayState* play);
typedef u16 (*NpcGetTextIdFunc)(struct PlayState*, struct Actor*);
typedef s16 (*NpcUpdateTalkStateFunc)(struct PlayState*, struct Actor*);
@@ -67,7 +67,7 @@ typedef struct ActorOverlay {
/* 0x1E */ s8 numLoaded; // original name: "clients"
} ActorOverlay; // size = 0x20
typedef void(*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct PlayState* play);
typedef void (*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct PlayState* play);
typedef struct {
/* 0x00 */ Vec3s rot; // Current actor shape rotation
@@ -196,7 +196,6 @@ typedef struct {
/* 0x158 */ u8 interactFlags;
} DynaPolyActor; // size = 0x15C
typedef enum Item00Type {
/* 0x00 */ ITEM00_RUPEE_GREEN,
/* 0x01 */ ITEM00_RUPEE_BLUE,
@@ -451,7 +450,6 @@ typedef enum {
/* 32 */ ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE
} ActorDrawDamageEffectType;
#define DEFINE_ACTOR(_name, enumValue, _allocType, _debugName) enumValue,
#define DEFINE_ACTOR_INTERNAL(_name, enumValue, _allocType, _debugName) enumValue,
#define DEFINE_ACTOR_UNSET(enumValue) enumValue,
src/code/z_en_a_keep.c
+9 -9
View File
@@ -14,15 +14,15 @@ void EnAObj_Idle(EnAObj* this, PlayState* play);
void EnAObj_Talk(EnAObj* this, PlayState* play);
ActorInit En_A_Obj_InitVars = {
ACTOR_EN_A_OBJ,
ACTORCAT_PROP,
FLAGS,
GAMEPLAY_KEEP,
sizeof(EnAObj),
(ActorFunc)EnAObj_Init,
(ActorFunc)EnAObj_Destroy,
(ActorFunc)EnAObj_Update,
(ActorFunc)EnAObj_Draw,
/* */ ACTOR_EN_A_OBJ,
/* */ ACTORCAT_PROP,
/* */ FLAGS,
/* */ GAMEPLAY_KEEP,
/* */ sizeof(EnAObj),
/* */ EnAObj_Init,
/* */ EnAObj_Destroy,
/* */ EnAObj_Update,
/* */ EnAObj_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/code/z_en_item00.c
+9 -9
View File
@@ -26,15 +26,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,
GAMEPLAY_KEEP,
sizeof(EnItem00),
(ActorFunc)EnItem00_Init,
(ActorFunc)EnItem00_Destroy,
(ActorFunc)EnItem00_Update,
(ActorFunc)EnItem00_Draw,
/**/ ACTOR_EN_ITEM00,
/**/ ACTORCAT_MISC,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(EnItem00),
/**/ EnItem00_Init,
/**/ EnItem00_Destroy,
/**/ EnItem00_Update,
/**/ EnItem00_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/code/z_player_call.c
+9 -9
View File
@@ -16,15 +16,15 @@ void PlayerCall_Update(Actor* thisx, PlayState* play);
void PlayerCall_Draw(Actor* thisx, PlayState* play);
ActorInit Player_InitVars = {
ACTOR_PLAYER,
ACTORCAT_PLAYER,
FLAGS,
GAMEPLAY_KEEP,
sizeof(Player),
(ActorFunc)PlayerCall_Init,
(ActorFunc)PlayerCall_Destroy,
(ActorFunc)PlayerCall_Update,
(ActorFunc)PlayerCall_Draw,
/**/ ACTOR_PLAYER,
/**/ ACTORCAT_PLAYER,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(Player),
/**/ PlayerCall_Init,
/**/ PlayerCall_Destroy,
/**/ PlayerCall_Update,
/**/ PlayerCall_Draw,
};
void Player_Init(Actor* thisx, PlayState* play);
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+9 -9
View File
@@ -21,15 +21,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,
GAMEPLAY_KEEP,
sizeof(ArmsHook),
(ActorFunc)ArmsHook_Init,
(ActorFunc)ArmsHook_Destroy,
(ActorFunc)ArmsHook_Update,
(ActorFunc)ArmsHook_Draw,
/**/ ACTOR_ARMS_HOOK,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(ArmsHook),
/**/ ArmsHook_Init,
/**/ ArmsHook_Destroy,
/**/ ArmsHook_Update,
/**/ ArmsHook_Draw,
};
static ColliderQuadInit D_808C1BC0 = {
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+9 -9
View File
@@ -22,15 +22,15 @@ void FireArrow_Fly(ArrowFire* this, PlayState* play);
#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
ActorInit Arrow_Fire_InitVars = {
ACTOR_ARROW_FIRE,
ACTORCAT_ITEMACTION,
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowFire),
(ActorFunc)ArrowFire_Init,
(ActorFunc)ArrowFire_Destroy,
(ActorFunc)ArrowFire_Update,
(ActorFunc)ArrowFire_Draw,
/**/ ACTOR_ARROW_FIRE,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(ArrowFire),
/**/ ArrowFire_Init,
/**/ ArrowFire_Destroy,
/**/ ArrowFire_Update,
/**/ ArrowFire_Draw,
};
static ColliderQuadInit sQuadInit = {
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+9 -9
View File
@@ -24,15 +24,15 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play);
static s32 sBssPad;
ActorInit Arrow_Ice_InitVars = {
ACTOR_ARROW_ICE,
ACTORCAT_ITEMACTION,
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowIce),
(ActorFunc)ArrowIce_Init,
(ActorFunc)ArrowIce_Destroy,
(ActorFunc)ArrowIce_Update,
(ActorFunc)ArrowIce_Draw,
/**/ ACTOR_ARROW_ICE,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(ArrowIce),
/**/ ArrowIce_Init,
/**/ ArrowIce_Destroy,
/**/ ArrowIce_Update,
/**/ ArrowIce_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+9 -9
View File
@@ -22,15 +22,15 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play);
#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
ActorInit Arrow_Light_InitVars = {
ACTOR_ARROW_LIGHT,
ACTORCAT_ITEMACTION,
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowLight),
(ActorFunc)ArrowLight_Init,
(ActorFunc)ArrowLight_Destroy,
(ActorFunc)ArrowLight_Update,
(ActorFunc)ArrowLight_Draw,
/**/ ACTOR_ARROW_LIGHT,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(ArrowLight),
/**/ ArrowLight_Init,
/**/ ArrowLight_Destroy,
/**/ ArrowLight_Update,
/**/ ArrowLight_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
+9 -9
View File
@@ -24,15 +24,15 @@ void func_80C0A458(BgAstrBombwall* this, PlayState* play);
void func_80C0A4BC(BgAstrBombwall* this, PlayState* play);
ActorInit Bg_Astr_Bombwall_InitVars = {
ACTOR_BG_ASTR_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_ASTR_OBJ,
sizeof(BgAstrBombwall),
(ActorFunc)BgAstrBombwall_Init,
(ActorFunc)BgAstrBombwall_Destroy,
(ActorFunc)BgAstrBombwall_Update,
(ActorFunc)BgAstrBombwall_Draw,
/**/ ACTOR_BG_ASTR_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_ASTR_OBJ,
/**/ sizeof(BgAstrBombwall),
/**/ BgAstrBombwall_Init,
/**/ BgAstrBombwall_Destroy,
/**/ BgAstrBombwall_Update,
/**/ BgAstrBombwall_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[2] = {
src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c
+9 -9
View File
@@ -19,15 +19,15 @@ void BgBotihasira_Draw(Actor* thisx, PlayState* play);
void BgBotihasira_DoNothing(BgBotihasira* this, PlayState* play);
ActorInit Bg_Botihasira_InitVars = {
ACTOR_BG_BOTIHASIRA,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_BOTIHASIRA,
sizeof(BgBotihasira),
(ActorFunc)BgBotihasira_Init,
(ActorFunc)BgBotihasira_Destroy,
(ActorFunc)BgBotihasira_Update,
(ActorFunc)BgBotihasira_Draw,
/**/ ACTOR_BG_BOTIHASIRA,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_BOTIHASIRA,
/**/ sizeof(BgBotihasira),
/**/ BgBotihasira_Init,
/**/ BgBotihasira_Destroy,
/**/ BgBotihasira_Update,
/**/ BgBotihasira_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+9 -3
View File
@@ -46,9 +46,15 @@ void func_808B7D34(Actor* thisx, PlayState* play);
void BgBreakwall_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Breakwall_InitVars = {
ACTOR_BG_BREAKWALL, ACTORCAT_ITEMACTION, FLAGS,
GAMEPLAY_KEEP, sizeof(BgBreakwall), (ActorFunc)BgBreakwall_Init,
(ActorFunc)NULL, (ActorFunc)BgBreakwall_Update, (ActorFunc)NULL,
/**/ ACTOR_BG_BREAKWALL,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(BgBreakwall),
/**/ BgBreakwall_Init,
/**/ NULL,
/**/ BgBreakwall_Update,
/**/ NULL,
};
typedef struct {
src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c
+9 -9
View File
@@ -42,15 +42,15 @@ typedef enum {
u8 sIsLoaded[32];
ActorInit Bg_Crace_Movebg_InitVars = {
ACTOR_BG_CRACE_MOVEBG,
ACTORCAT_BG,
FLAGS,
OBJECT_CRACE_OBJECT,
sizeof(BgCraceMovebg),
(ActorFunc)BgCraceMovebg_Init,
(ActorFunc)BgCraceMovebg_Destroy,
(ActorFunc)BgCraceMovebg_Update,
(ActorFunc)BgCraceMovebg_Draw,
/**/ ACTOR_BG_CRACE_MOVEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_CRACE_OBJECT,
/**/ sizeof(BgCraceMovebg),
/**/ BgCraceMovebg_Init,
/**/ BgCraceMovebg_Destroy,
/**/ BgCraceMovebg_Update,
/**/ BgCraceMovebg_Draw,
};
static u8 sHasInitializedIsLoaded = 0;
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+9 -9
View File
@@ -20,15 +20,15 @@ void BgCtowerGear_UpdateOrgan(Actor* thisx, PlayState* play);
void BgCtowerGear_DrawOrgan(Actor* thisx, PlayState* play);
ActorInit Bg_Ctower_Gear_InitVars = {
ACTOR_BG_CTOWER_GEAR,
ACTORCAT_PROP,
FLAGS,
OBJECT_CTOWER_ROT,
sizeof(BgCtowerGear),
(ActorFunc)BgCtowerGear_Init,
(ActorFunc)BgCtowerGear_Destroy,
(ActorFunc)BgCtowerGear_Update,
(ActorFunc)BgCtowerGear_Draw,
/**/ ACTOR_BG_CTOWER_GEAR,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_CTOWER_ROT,
/**/ sizeof(BgCtowerGear),
/**/ BgCtowerGear_Init,
/**/ BgCtowerGear_Destroy,
/**/ BgCtowerGear_Update,
/**/ BgCtowerGear_Draw,
};
static Vec3f sExitSplashOffsets[] = {
src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
+9 -9
View File
@@ -22,15 +22,15 @@ void BgCtowerRot_DoorIdle(BgCtowerRot* this, PlayState* play);
void BgCtowerRot_SetupDoorClose(BgCtowerRot* this, PlayState* play);
ActorInit Bg_Ctower_Rot_InitVars = {
ACTOR_BG_CTOWER_ROT,
ACTORCAT_BG,
FLAGS,
OBJECT_CTOWER_ROT,
sizeof(BgCtowerRot),
(ActorFunc)BgCtowerRot_Init,
(ActorFunc)BgCtowerRot_Destroy,
(ActorFunc)BgCtowerRot_Update,
(ActorFunc)BgCtowerRot_Draw,
/**/ ACTOR_BG_CTOWER_ROT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_CTOWER_ROT,
/**/ sizeof(BgCtowerRot),
/**/ BgCtowerRot_Init,
/**/ BgCtowerRot_Destroy,
/**/ BgCtowerRot_Update,
/**/ BgCtowerRot_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c
+9 -9
View File
@@ -16,15 +16,15 @@ void BgDanpeiMovebg_Update(Actor* thisx, PlayState* play);
#if 0
ActorInit Bg_Danpei_Movebg_InitVars = {
ACTOR_BG_DANPEI_MOVEBG,
ACTORCAT_BG,
FLAGS,
GAMEPLAY_KEEP,
sizeof(BgDanpeiMovebg),
(ActorFunc)BgDanpeiMovebg_Init,
(ActorFunc)BgDanpeiMovebg_Destroy,
(ActorFunc)BgDanpeiMovebg_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_DANPEI_MOVEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(BgDanpeiMovebg),
/**/ BgDanpeiMovebg_Init,
/**/ BgDanpeiMovebg_Destroy,
/**/ BgDanpeiMovebg_Update,
/**/ NULL,
};
// static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
+9 -9
View File
@@ -30,15 +30,15 @@ AnimatedMaterial* D_80B83C70;
AnimatedMaterial* D_80B83C74;
ActorInit Bg_Dblue_Balance_InitVars = {
ACTOR_BG_DBLUE_BALANCE,
ACTORCAT_BG,
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueBalance),
(ActorFunc)BgDblueBalance_Init,
(ActorFunc)BgDblueBalance_Destroy,
(ActorFunc)BgDblueBalance_Update,
(ActorFunc)BgDblueBalance_Draw,
/**/ ACTOR_BG_DBLUE_BALANCE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DBLUE_OBJECT,
/**/ sizeof(BgDblueBalance),
/**/ BgDblueBalance_Init,
/**/ BgDblueBalance_Destroy,
/**/ BgDblueBalance_Update,
/**/ BgDblueBalance_Draw,
};
typedef struct {
src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c
+9 -9
View File
@@ -17,15 +17,15 @@ void BgDblueElevator_Draw(Actor* thisx, PlayState* play);
#if 0
ActorInit Bg_Dblue_Elevator_InitVars = {
ACTOR_BG_DBLUE_ELEVATOR,
ACTORCAT_BG,
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueElevator),
(ActorFunc)BgDblueElevator_Init,
(ActorFunc)BgDblueElevator_Destroy,
(ActorFunc)BgDblueElevator_Update,
(ActorFunc)BgDblueElevator_Draw,
/**/ ACTOR_BG_DBLUE_ELEVATOR,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DBLUE_OBJECT,
/**/ sizeof(BgDblueElevator),
/**/ BgDblueElevator_Init,
/**/ BgDblueElevator_Destroy,
/**/ BgDblueElevator_Update,
/**/ BgDblueElevator_Draw,
};
// static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+9 -9
View File
@@ -46,15 +46,15 @@ u8 D_80A2B870[][2] = {
};
ActorInit Bg_Dblue_Movebg_InitVars = {
ACTOR_BG_DBLUE_MOVEBG,
ACTORCAT_BG,
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueMovebg),
(ActorFunc)BgDblueMovebg_Init,
(ActorFunc)BgDblueMovebg_Destroy,
(ActorFunc)BgDblueMovebg_Update,
(ActorFunc)BgDblueMovebg_Draw,
/**/ ACTOR_BG_DBLUE_MOVEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DBLUE_OBJECT,
/**/ sizeof(BgDblueMovebg),
/**/ BgDblueMovebg_Init,
/**/ BgDblueMovebg_Destroy,
/**/ BgDblueMovebg_Update,
/**/ BgDblueMovebg_Draw,
};
static Gfx* sOpaDLists[] = {
src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
+9 -9
View File
@@ -26,15 +26,15 @@ void func_80B84EF0(BgDblueWaterfall* this, PlayState* play);
void func_80B84F20(BgDblueWaterfall* this, PlayState* play);
ActorInit Bg_Dblue_Waterfall_InitVars = {
ACTOR_BG_DBLUE_WATERFALL,
ACTORCAT_PROP,
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueWaterfall),
(ActorFunc)BgDblueWaterfall_Init,
(ActorFunc)BgDblueWaterfall_Destroy,
(ActorFunc)BgDblueWaterfall_Update,
(ActorFunc)BgDblueWaterfall_Draw,
/**/ ACTOR_BG_DBLUE_WATERFALL,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DBLUE_OBJECT,
/**/ sizeof(BgDblueWaterfall),
/**/ BgDblueWaterfall_Init,
/**/ BgDblueWaterfall_Destroy,
/**/ BgDblueWaterfall_Update,
/**/ BgDblueWaterfall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
+9 -9
View File
@@ -25,15 +25,15 @@ void BgDkjailIvy_SetupFadeOut(BgDkjailIvy* this);
void BgDkjailIvy_FadeOut(BgDkjailIvy* this, PlayState* play);
ActorInit Bg_Dkjail_Ivy_InitVars = {
ACTOR_BG_DKJAIL_IVY,
ACTORCAT_BG,
FLAGS,
OBJECT_DKJAIL_OBJ,
sizeof(BgDkjailIvy),
(ActorFunc)BgDkjailIvy_Init,
(ActorFunc)BgDkjailIvy_Destroy,
(ActorFunc)BgDkjailIvy_Update,
(ActorFunc)BgDkjailIvy_Draw,
/**/ ACTOR_BG_DKJAIL_IVY,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_DKJAIL_OBJ,
/**/ sizeof(BgDkjailIvy),
/**/ BgDkjailIvy_Init,
/**/ BgDkjailIvy_Destroy,
/**/ BgDkjailIvy_Update,
/**/ BgDkjailIvy_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+9 -9
View File
@@ -26,15 +26,15 @@ void BgDyYoseizo_UpdateEffects(BgDyYoseizo* this, PlayState* play);
void BgDyYoseizo_DrawEffects(BgDyYoseizo* this, PlayState* play);
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,
(ActorFunc)NULL,
/**/ ACTOR_BG_DY_YOSEIZO,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_DY_OBJ,
/**/ sizeof(BgDyYoseizo),
/**/ BgDyYoseizo_Init,
/**/ BgDyYoseizo_Destroy,
/**/ BgDyYoseizo_Update,
/**/ NULL,
};
typedef enum GreatFairyAnimation {
src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c
+9 -9
View File
@@ -27,15 +27,15 @@ void func_80BC4530(BgF40Block* this, PlayState* play);
void func_80BC457C(BgF40Block* this, PlayState* play);
ActorInit Bg_F40_Block_InitVars = {
ACTOR_BG_F40_BLOCK,
ACTORCAT_BG,
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Block),
(ActorFunc)BgF40Block_Init,
(ActorFunc)BgF40Block_Destroy,
(ActorFunc)BgF40Block_Update,
(ActorFunc)BgF40Block_Draw,
/**/ ACTOR_BG_F40_BLOCK,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_F40_OBJ,
/**/ sizeof(BgF40Block),
/**/ BgF40Block_Init,
/**/ BgF40Block_Destroy,
/**/ BgF40Block_Update,
/**/ BgF40Block_Draw,
};
static Vec3f D_80BC4620[] = {
src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c
+9 -9
View File
@@ -20,15 +20,15 @@ void func_808D75F0(BgF40Flift* this, PlayState* play);
void func_808D7714(BgF40Flift* this, PlayState* play);
ActorInit Bg_F40_Flift_InitVars = {
ACTOR_BG_F40_FLIFT,
ACTORCAT_BG,
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Flift),
(ActorFunc)BgF40Flift_Init,
(ActorFunc)BgF40Flift_Destroy,
(ActorFunc)BgF40Flift_Update,
(ActorFunc)BgF40Flift_Draw,
/**/ ACTOR_BG_F40_FLIFT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_F40_OBJ,
/**/ sizeof(BgF40Flift),
/**/ BgF40Flift_Init,
/**/ BgF40Flift_Destroy,
/**/ BgF40Flift_Update,
/**/ BgF40Flift_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
+9 -9
View File
@@ -25,15 +25,15 @@ void BgF40Switch_WaitToPress(BgF40Switch* this, PlayState* play);
void BgF40Switch_IdleUnpressed(BgF40Switch* this, PlayState* play);
ActorInit Bg_F40_Switch_InitVars = {
ACTOR_BG_F40_SWITCH,
ACTORCAT_SWITCH,
FLAGS,
OBJECT_F40_SWITCH,
sizeof(BgF40Switch),
(ActorFunc)BgF40Switch_Init,
(ActorFunc)BgF40Switch_Destroy,
(ActorFunc)BgF40Switch_Update,
(ActorFunc)BgF40Switch_Draw,
/**/ ACTOR_BG_F40_SWITCH,
/**/ ACTORCAT_SWITCH,
/**/ FLAGS,
/**/ OBJECT_F40_SWITCH,
/**/ sizeof(BgF40Switch),
/**/ BgF40Switch_Init,
/**/ BgF40Switch_Destroy,
/**/ BgF40Switch_Update,
/**/ BgF40Switch_Draw,
};
s32 sBgF40SwitchGlobalsInitialized = false;
src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c
+10 -10
View File
@@ -19,16 +19,16 @@ void BgF40Swlift_Draw(Actor* thisx, PlayState* play);
static s32 sSwitchFlags[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
static s32 sHeights[4];
const ActorInit Bg_F40_Swlift_InitVars = {
ACTOR_BG_F40_SWLIFT,
ACTORCAT_BG,
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Swlift),
(ActorFunc)BgF40Swlift_Init,
(ActorFunc)BgF40Swlift_Destroy,
(ActorFunc)BgF40Swlift_Update,
(ActorFunc)BgF40Swlift_Draw,
ActorInit Bg_F40_Swlift_InitVars = {
/**/ ACTOR_BG_F40_SWLIFT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_F40_OBJ,
/**/ sizeof(BgF40Swlift),
/**/ BgF40Swlift_Init,
/**/ BgF40Swlift_Destroy,
/**/ BgF40Swlift_Update,
/**/ BgF40Swlift_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c
+9 -9
View File
@@ -22,15 +22,15 @@ void func_809AC68C(BgFireWall* this, PlayState* play);
void func_809AC6C0(BgFireWall* this, PlayState* play);
ActorInit Bg_Fire_Wall_InitVars = {
ACTOR_BG_FIRE_WALL,
ACTORCAT_BG,
FLAGS,
OBJECT_FWALL,
sizeof(BgFireWall),
(ActorFunc)BgFireWall_Init,
(ActorFunc)BgFireWall_Destroy,
(ActorFunc)BgFireWall_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_FIRE_WALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_FWALL,
/**/ sizeof(BgFireWall),
/**/ BgFireWall_Init,
/**/ BgFireWall_Destroy,
/**/ BgFireWall_Update,
/**/ NULL,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
+9 -9
View File
@@ -17,15 +17,15 @@ void BgFuKaiten_Update(Actor* thisx, PlayState* play);
void BgFuKaiten_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Fu_Kaiten_InitVars = {
ACTOR_BG_FU_KAITEN,
ACTORCAT_BG,
FLAGS,
OBJECT_FU_KAITEN,
sizeof(BgFuKaiten),
(ActorFunc)BgFuKaiten_Init,
(ActorFunc)BgFuKaiten_Destroy,
(ActorFunc)BgFuKaiten_Update,
(ActorFunc)BgFuKaiten_Draw,
/**/ ACTOR_BG_FU_KAITEN,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_FU_KAITEN,
/**/ sizeof(BgFuKaiten),
/**/ BgFuKaiten_Init,
/**/ BgFuKaiten_Destroy,
/**/ BgFuKaiten_Update,
/**/ BgFuKaiten_Draw,
};
void BgFuKaiten_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c
+9 -9
View File
@@ -17,15 +17,15 @@ void BgFuMizu_Update(Actor* thisx, PlayState* play);
void BgFuMizu_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Fu_Mizu_InitVars = {
ACTOR_BG_FU_MIZU,
ACTORCAT_BG,
FLAGS,
OBJECT_FU_KAITEN,
sizeof(BgFuMizu),
(ActorFunc)BgFuMizu_Init,
(ActorFunc)BgFuMizu_Destroy,
(ActorFunc)BgFuMizu_Update,
(ActorFunc)BgFuMizu_Draw,
/**/ ACTOR_BG_FU_MIZU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_FU_KAITEN,
/**/ sizeof(BgFuMizu),
/**/ BgFuMizu_Init,
/**/ BgFuMizu_Destroy,
/**/ BgFuMizu_Update,
/**/ BgFuMizu_Draw,
};
void BgFuMizu_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+9 -9
View File
@@ -24,15 +24,15 @@ void BgGoronOyu_SpawnEffects(BgGoronOyu* this, PlayState* play);
void func_80B40160(BgGoronOyu* this, PlayState* play);
ActorInit Bg_Goron_Oyu_InitVars = {
ACTOR_BG_GORON_OYU,
ACTORCAT_BG,
FLAGS,
OBJECT_OYU,
sizeof(BgGoronOyu),
(ActorFunc)BgGoronOyu_Init,
(ActorFunc)BgGoronOyu_Destroy,
(ActorFunc)BgGoronOyu_Update,
(ActorFunc)BgGoronOyu_Draw,
/**/ ACTOR_BG_GORON_OYU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_OYU,
/**/ sizeof(BgGoronOyu),
/**/ BgGoronOyu_Init,
/**/ BgGoronOyu_Destroy,
/**/ BgGoronOyu_Update,
/**/ BgGoronOyu_Draw,
};
void func_80B40080(BgGoronOyu* this) {
src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c
+9 -9
View File
@@ -25,15 +25,15 @@ void BgHakaBombwall_SetupEndCutscene(BgHakaBombwall* this);
void BgHakaBombwall_EndCutscene(BgHakaBombwall* this, PlayState* play);
ActorInit Bg_Haka_Bombwall_InitVars = {
ACTOR_BG_HAKA_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaBombwall),
(ActorFunc)BgHakaBombwall_Init,
(ActorFunc)BgHakaBombwall_Destroy,
(ActorFunc)BgHakaBombwall_Update,
(ActorFunc)BgHakaBombwall_Draw,
/**/ ACTOR_BG_HAKA_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJ,
/**/ sizeof(BgHakaBombwall),
/**/ BgHakaBombwall_Init,
/**/ BgHakaBombwall_Destroy,
/**/ BgHakaBombwall_Update,
/**/ BgHakaBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
+9 -9
View File
@@ -27,15 +27,15 @@ void func_80B6DEA8(BgHakaCurtain* this, PlayState* play);
void func_80B6DE80(BgHakaCurtain* this);
ActorInit Bg_Haka_Curtain_InitVars = {
ACTOR_BG_HAKA_CURTAIN,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaCurtain),
(ActorFunc)BgHakaCurtain_Init,
(ActorFunc)BgHakaCurtain_Destroy,
(ActorFunc)BgHakaCurtain_Update,
(ActorFunc)BgHakaCurtain_Draw,
/**/ ACTOR_BG_HAKA_CURTAIN,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJ,
/**/ sizeof(BgHakaCurtain),
/**/ BgHakaCurtain_Init,
/**/ BgHakaCurtain_Destroy,
/**/ BgHakaCurtain_Update,
/**/ BgHakaCurtain_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
+9 -9
View File
@@ -24,15 +24,15 @@ void BgHakaTomb_SetupDoNothing(BgHakaTomb* this);
void BgHakaTomb_DoNothing(BgHakaTomb* this, PlayState* play);
ActorInit Bg_Haka_Tomb_InitVars = {
ACTOR_BG_HAKA_TOMB,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaTomb),
(ActorFunc)BgHakaTomb_Init,
(ActorFunc)BgHakaTomb_Destroy,
(ActorFunc)BgHakaTomb_Update,
(ActorFunc)BgHakaTomb_Draw,
/**/ ACTOR_BG_HAKA_TOMB,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKA_OBJ,
/**/ sizeof(BgHakaTomb),
/**/ BgHakaTomb_Init,
/**/ BgHakaTomb_Destroy,
/**/ BgHakaTomb_Update,
/**/ BgHakaTomb_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c
+9 -9
View File
@@ -27,15 +27,15 @@ void func_80ABCD98(BgHakuginBombwall* this, PlayState* play);
void func_80ABCE60(BgHakuginBombwall* this, PlayState* play);
ActorInit Bg_Hakugin_Bombwall_InitVars = {
ACTOR_BG_HAKUGIN_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginBombwall),
(ActorFunc)BgHakuginBombwall_Init,
(ActorFunc)BgHakuginBombwall_Destroy,
(ActorFunc)BgHakuginBombwall_Update,
(ActorFunc)BgHakuginBombwall_Draw,
/**/ ACTOR_BG_HAKUGIN_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKUGIN_OBJ,
/**/ sizeof(BgHakuginBombwall),
/**/ BgHakuginBombwall_Init,
/**/ BgHakuginBombwall_Destroy,
/**/ BgHakuginBombwall_Update,
/**/ BgHakuginBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c
+9 -9
View File
@@ -19,15 +19,15 @@ void BgHakuginElvpole_Draw(Actor* thisx, PlayState* play);
void func_80ABD92C(BgHakuginElvpole* this, PlayState* play);
ActorInit Bg_Hakugin_Elvpole_InitVars = {
ACTOR_BG_HAKUGIN_ELVPOLE,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginElvpole),
(ActorFunc)BgHakuginElvpole_Init,
(ActorFunc)BgHakuginElvpole_Destroy,
(ActorFunc)BgHakuginElvpole_Update,
(ActorFunc)BgHakuginElvpole_Draw,
/**/ ACTOR_BG_HAKUGIN_ELVPOLE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKUGIN_OBJ,
/**/ sizeof(BgHakuginElvpole),
/**/ BgHakuginElvpole_Init,
/**/ BgHakuginElvpole_Destroy,
/**/ BgHakuginElvpole_Update,
/**/ BgHakuginElvpole_Draw,
};
void BgHakuginElvpole_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+9 -9
View File
@@ -40,15 +40,15 @@ BgHakuginPostColliders D_80A9DDC0;
BgHakuginPostUnkStruct D_80A9E028;
ActorInit Bg_Hakugin_Post_InitVars = {
ACTOR_BG_HAKUGIN_POST,
ACTORCAT_BG,
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginPost),
(ActorFunc)BgHakuginPost_Init,
(ActorFunc)BgHakuginPost_Destroy,
(ActorFunc)BgHakuginPost_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_HAKUGIN_POST,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_HAKUGIN_OBJ,
/**/ sizeof(BgHakuginPost),
/**/ BgHakuginPost_Init,
/**/ BgHakuginPost_Destroy,
/**/ BgHakuginPost_Update,
/**/ NULL,
};
typedef struct {
src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
+9 -9
View File
@@ -40,15 +40,15 @@ void func_80B165E0(BgHakuginSwitch* this, PlayState* play);
u32 D_80B16AF0;
ActorInit Bg_Hakugin_Switch_InitVars = {
ACTOR_BG_HAKUGIN_SWITCH,
ACTORCAT_SWITCH,
FLAGS,
OBJECT_GORONSWITCH,
sizeof(BgHakuginSwitch),
(ActorFunc)BgHakuginSwitch_Init,
(ActorFunc)BgHakuginSwitch_Destroy,
(ActorFunc)BgHakuginSwitch_Update,
(ActorFunc)BgHakuginSwitch_Draw,
/**/ ACTOR_BG_HAKUGIN_SWITCH,
/**/ ACTORCAT_SWITCH,
/**/ FLAGS,
/**/ OBJECT_GORONSWITCH,
/**/ sizeof(BgHakuginSwitch),
/**/ BgHakuginSwitch_Init,
/**/ BgHakuginSwitch_Destroy,
/**/ BgHakuginSwitch_Update,
/**/ BgHakuginSwitch_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c
+9 -9
View File
@@ -24,15 +24,15 @@ void func_80AC4C34(BgIcefloe* this, PlayState* play);
void func_80AC4CF0(BgIcefloe* this);
ActorInit Bg_Icefloe_InitVars = {
ACTOR_BG_ICEFLOE,
ACTORCAT_BG,
FLAGS,
OBJECT_ICEFLOE,
sizeof(BgIcefloe),
(ActorFunc)BgIcefloe_Init,
(ActorFunc)BgIcefloe_Destroy,
(ActorFunc)BgIcefloe_Update,
(ActorFunc)BgIcefloe_Draw,
/**/ ACTOR_BG_ICEFLOE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_ICEFLOE,
/**/ sizeof(BgIcefloe),
/**/ BgIcefloe_Init,
/**/ BgIcefloe_Destroy,
/**/ BgIcefloe_Update,
/**/ BgIcefloe_Draw,
};
static BgIcefloe* sSpawnedInstances[] = { NULL, NULL, NULL };
src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
+9 -9
View File
@@ -43,15 +43,15 @@ static ColliderCylinderInit sCylinderInit = {
};
ActorInit Bg_Icicle_InitVars = {
ACTOR_BG_ICICLE,
ACTORCAT_PROP,
FLAGS,
OBJECT_ICICLE,
sizeof(BgIcicle),
(ActorFunc)BgIcicle_Init,
(ActorFunc)BgIcicle_Destroy,
(ActorFunc)BgIcicle_Update,
(ActorFunc)BgIcicle_Draw,
/**/ ACTOR_BG_ICICLE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_ICICLE,
/**/ sizeof(BgIcicle),
/**/ BgIcicle_Init,
/**/ BgIcicle_Destroy,
/**/ BgIcicle_Update,
/**/ BgIcicle_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c
+9 -9
View File
@@ -26,15 +26,15 @@ void func_80B7F398(BgIkanaBlock* this, PlayState* play);
void func_80B7F564(Actor* thisx, PlayState* play);
ActorInit Bg_Ikana_Block_InitVars = {
ACTOR_BG_IKANA_BLOCK,
ACTORCAT_BG,
FLAGS,
GAMEPLAY_DANGEON_KEEP,
sizeof(BgIkanaBlock),
(ActorFunc)BgIkanaBlock_Init,
(ActorFunc)BgIkanaBlock_Destroy,
(ActorFunc)BgIkanaBlock_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_IKANA_BLOCK,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ GAMEPLAY_DANGEON_KEEP,
/**/ sizeof(BgIkanaBlock),
/**/ BgIkanaBlock_Init,
/**/ BgIkanaBlock_Destroy,
/**/ BgIkanaBlock_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c
+9 -9
View File
@@ -26,15 +26,15 @@ void func_80BD5118(BgIkanaBombwall* this);
void func_80BD5134(BgIkanaBombwall* this, PlayState* play);
ActorInit Bg_Ikana_Bombwall_InitVars = {
ACTOR_BG_IKANA_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaBombwall),
(ActorFunc)BgIkanaBombwall_Init,
(ActorFunc)BgIkanaBombwall_Destroy,
(ActorFunc)BgIkanaBombwall_Update,
(ActorFunc)BgIkanaBombwall_Draw,
/**/ ACTOR_BG_IKANA_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaBombwall),
/**/ BgIkanaBombwall_Init,
/**/ BgIkanaBombwall_Destroy,
/**/ BgIkanaBombwall_Update,
/**/ BgIkanaBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit1 = {
src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
+9 -9
View File
@@ -25,15 +25,15 @@ void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this);
void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, PlayState* play);
ActorInit Bg_Ikana_Dharma_InitVars = {
ACTOR_BG_IKANA_DHARMA,
ACTORCAT_BG,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaDharma),
(ActorFunc)BgIkanaDharma_Init,
(ActorFunc)BgIkanaDharma_Destroy,
(ActorFunc)BgIkanaDharma_Update,
(ActorFunc)BgIkanaDharma_Draw,
/**/ ACTOR_BG_IKANA_DHARMA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaDharma),
/**/ BgIkanaDharma_Init,
/**/ BgIkanaDharma_Destroy,
/**/ BgIkanaDharma_Update,
/**/ BgIkanaDharma_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
+9 -9
View File
@@ -27,15 +27,15 @@ void BgIkanaMirror_SetupEmitLight(BgIkanaMirror* this);
void BgIkanaMirror_EmitLight(BgIkanaMirror* this, PlayState* play);
ActorInit Bg_Ikana_Mirror_InitVars = {
ACTOR_BG_IKANA_MIRROR,
ACTORCAT_PROP,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaMirror),
(ActorFunc)BgIkanaMirror_Init,
(ActorFunc)BgIkanaMirror_Destroy,
(ActorFunc)BgIkanaMirror_Update,
(ActorFunc)BgIkanaMirror_Draw,
/**/ ACTOR_BG_IKANA_MIRROR,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaMirror),
/**/ BgIkanaMirror_Init,
/**/ BgIkanaMirror_Destroy,
/**/ BgIkanaMirror_Update,
/**/ BgIkanaMirror_Draw,
};
static ColliderTrisElementInit sMirrorColliderElementsInit[] = {
src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
+9 -9
View File
@@ -22,15 +22,15 @@ void BgIkanaRay_SetActivated(BgIkanaRay* this);
void BgIkanaRay_UpdateActivated(BgIkanaRay* this, PlayState* play);
ActorInit Bg_Ikana_Ray_InitVars = {
ACTOR_BG_IKANA_RAY,
ACTORCAT_PROP,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaRay),
(ActorFunc)BgIkanaRay_Init,
(ActorFunc)BgIkanaRay_Destroy,
(ActorFunc)BgIkanaRay_Update,
(ActorFunc)BgIkanaRay_Draw,
/**/ ACTOR_BG_IKANA_RAY,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaRay),
/**/ BgIkanaRay_Init,
/**/ BgIkanaRay_Destroy,
/**/ BgIkanaRay_Update,
/**/ BgIkanaRay_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
+9 -9
View File
@@ -35,15 +35,15 @@ void func_80B81DAC(BgIkanaRotaryroom* this);
void func_80B81DC8(Actor* thisx, PlayState* play);
ActorInit Bg_Ikana_Rotaryroom_InitVars = {
ACTOR_BG_IKANA_ROTARYROOM,
ACTORCAT_BG,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaRotaryroom),
(ActorFunc)BgIkanaRotaryroom_Init,
(ActorFunc)BgIkanaRotaryroom_Destroy,
(ActorFunc)BgIkanaRotaryroom_Update,
(ActorFunc)BgIkanaRotaryroom_Draw,
/**/ ACTOR_BG_IKANA_ROTARYROOM,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaRotaryroom),
/**/ BgIkanaRotaryroom_Init,
/**/ BgIkanaRotaryroom_Destroy,
/**/ BgIkanaRotaryroom_Update,
/**/ BgIkanaRotaryroom_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit1[2] = {
src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
+9 -9
View File
@@ -37,15 +37,15 @@ void BgIkanaShutter_SetupDoNothing(BgIkanaShutter* this);
void BgIkanaShutter_DoNothing(BgIkanaShutter* this, PlayState* play);
ActorInit Bg_Ikana_Shutter_InitVars = {
ACTOR_BG_IKANA_SHUTTER,
ACTORCAT_SWITCH,
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaShutter),
(ActorFunc)BgIkanaShutter_Init,
(ActorFunc)BgIkanaShutter_Destroy,
(ActorFunc)BgIkanaShutter_Update,
(ActorFunc)BgIkanaShutter_Draw,
/**/ ACTOR_BG_IKANA_SHUTTER,
/**/ ACTORCAT_SWITCH,
/**/ FLAGS,
/**/ OBJECT_IKANA_OBJ,
/**/ sizeof(BgIkanaShutter),
/**/ BgIkanaShutter_Init,
/**/ BgIkanaShutter_Destroy,
/**/ BgIkanaShutter_Update,
/**/ BgIkanaShutter_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
+9 -9
View File
@@ -30,15 +30,15 @@ void func_80C0AD64(BgIkninSusceil* this, PlayState* play);
void func_80C0AE5C(BgIkninSusceil* this, PlayState* play);
ActorInit Bg_Iknin_Susceil_InitVars = {
ACTOR_BG_IKNIN_SUSCEIL,
ACTORCAT_BG,
FLAGS,
OBJECT_IKNINSIDE_OBJ,
sizeof(BgIkninSusceil),
(ActorFunc)BgIkninSusceil_Init,
(ActorFunc)BgIkninSusceil_Destroy,
(ActorFunc)BgIkninSusceil_Update,
(ActorFunc)BgIkninSusceil_Draw,
/**/ ACTOR_BG_IKNIN_SUSCEIL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKNINSIDE_OBJ,
/**/ sizeof(BgIkninSusceil),
/**/ BgIkninSusceil_Init,
/**/ BgIkninSusceil_Destroy,
/**/ BgIkninSusceil_Update,
/**/ BgIkninSusceil_Draw,
};
static s32 sPad = 0;
src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
+9 -9
View File
@@ -19,15 +19,15 @@ void BgIkninside_Draw(Actor* thisx, PlayState* play);
void func_80C072D0(BgIkninside* this, PlayState* play);
ActorInit Bg_Ikninside_InitVars = {
ACTOR_BG_IKNINSIDE,
ACTORCAT_BG,
FLAGS,
OBJECT_IKNINSIDE_OBJ,
sizeof(BgIkninside),
(ActorFunc)BgIkninside_Init,
(ActorFunc)BgIkninside_Destroy,
(ActorFunc)BgIkninside_Update,
(ActorFunc)BgIkninside_Draw,
/**/ ACTOR_BG_IKNINSIDE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKNINSIDE_OBJ,
/**/ sizeof(BgIkninside),
/**/ BgIkninside_Init,
/**/ BgIkninside_Destroy,
/**/ BgIkninside_Update,
/**/ BgIkninside_Draw,
};
static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 };
src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c
+9 -9
View File
@@ -28,15 +28,15 @@ void func_80BD78C4(Actor* thisx, PlayState* play);
void func_80BD7538(Actor* thisx, PlayState* play);
ActorInit Bg_Iknv_Doukutu_InitVars = {
ACTOR_BG_IKNV_DOUKUTU,
ACTORCAT_BG,
FLAGS,
OBJECT_IKNV_OBJ,
sizeof(BgIknvDoukutu),
(ActorFunc)BgIknvDoukutu_Init,
(ActorFunc)BgIknvDoukutu_Destroy,
(ActorFunc)BgIknvDoukutu_Update,
(ActorFunc)BgIknvDoukutu_Draw,
/**/ ACTOR_BG_IKNV_DOUKUTU,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKNV_OBJ,
/**/ sizeof(BgIknvDoukutu),
/**/ BgIknvDoukutu_Init,
/**/ BgIknvDoukutu_Destroy,
/**/ BgIknvDoukutu_Update,
/**/ BgIknvDoukutu_Draw,
};
void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+9 -9
View File
@@ -22,15 +22,15 @@ void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, PlayState* play);
void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, PlayState* play);
ActorInit Bg_Iknv_Obj_InitVars = {
ACTOR_BG_IKNV_OBJ,
ACTORCAT_BG,
FLAGS,
OBJECT_IKNV_OBJ,
sizeof(BgIknvObj),
(ActorFunc)BgIknvObj_Init,
(ActorFunc)BgIknvObj_Destroy,
(ActorFunc)BgIknvObj_Update,
(ActorFunc)BgIknvObj_Draw,
/**/ ACTOR_BG_IKNV_OBJ,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_IKNV_OBJ,
/**/ sizeof(BgIknvObj),
/**/ BgIknvObj_Init,
/**/ BgIknvObj_Destroy,
/**/ BgIknvObj_Update,
/**/ BgIknvObj_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+9 -9
View File
@@ -27,15 +27,15 @@ void func_80954340(BgIngate* this, PlayState* play);
void func_809543D4(BgIngate* this, PlayState* play);
ActorInit Bg_Ingate_InitVars = {
ACTOR_BG_INGATE,
ACTORCAT_BG,
FLAGS,
OBJECT_SICHITAI_OBJ,
sizeof(BgIngate),
(ActorFunc)BgIngate_Init,
(ActorFunc)BgIngate_Destroy,
(ActorFunc)BgIngate_Update,
(ActorFunc)BgIngate_Draw,
/**/ ACTOR_BG_INGATE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SICHITAI_OBJ,
/**/ sizeof(BgIngate),
/**/ BgIngate_Init,
/**/ BgIngate_Destroy,
/**/ BgIngate_Update,
/**/ BgIngate_Draw,
};
/**
src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
+9 -9
View File
@@ -16,15 +16,15 @@ void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play);
void BgInibsMovebg_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Inibs_Movebg_InitVars = {
ACTOR_BG_INIBS_MOVEBG,
ACTORCAT_BG,
FLAGS,
OBJECT_INIBS_OBJECT,
sizeof(BgInibsMovebg),
(ActorFunc)BgInibsMovebg_Init,
(ActorFunc)BgInibsMovebg_Destroy,
(ActorFunc)Actor_Noop,
(ActorFunc)BgInibsMovebg_Draw,
/**/ ACTOR_BG_INIBS_MOVEBG,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_INIBS_OBJECT,
/**/ sizeof(BgInibsMovebg),
/**/ BgInibsMovebg_Init,
/**/ BgInibsMovebg_Destroy,
/**/ Actor_Noop,
/**/ BgInibsMovebg_Draw,
};
Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL };
src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
+9 -9
View File
@@ -21,15 +21,15 @@ void func_80A538E0(BgKeikokuSaku* this, PlayState* play);
void func_80A53994(BgKeikokuSaku* this, PlayState* play);
ActorInit Bg_Keikoku_Saku_InitVars = {
ACTOR_BG_KEIKOKU_SAKU,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_KEIKOKU_OBJ,
sizeof(BgKeikokuSaku),
(ActorFunc)BgKeikokuSaku_Init,
(ActorFunc)BgKeikokuSaku_Destroy,
(ActorFunc)BgKeikokuSaku_Update,
(ActorFunc)BgKeikokuSaku_Draw,
/**/ ACTOR_BG_KEIKOKU_SAKU,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_KEIKOKU_OBJ,
/**/ sizeof(BgKeikokuSaku),
/**/ BgKeikokuSaku_Init,
/**/ BgKeikokuSaku_Destroy,
/**/ BgKeikokuSaku_Update,
/**/ BgKeikokuSaku_Draw,
};
void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
+10 -10
View File
@@ -16,16 +16,16 @@ void BgKeikokuSpr_Destroy(Actor* thisx, PlayState* play);
void BgKeikokuSpr_Update(Actor* thisx, PlayState* play);
void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play);
const ActorInit Bg_Keikoku_Spr_InitVars = {
ACTOR_BG_KEIKOKU_SPR,
ACTORCAT_PROP,
FLAGS,
OBJECT_KEIKOKU_OBJ,
sizeof(BgKeikokuSpr),
(ActorFunc)BgKeikokuSpr_Init,
(ActorFunc)BgKeikokuSpr_Destroy,
(ActorFunc)BgKeikokuSpr_Update,
(ActorFunc)BgKeikokuSpr_Draw,
ActorInit Bg_Keikoku_Spr_InitVars = {
/**/ ACTOR_BG_KEIKOKU_SPR,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_KEIKOKU_OBJ,
/**/ sizeof(BgKeikokuSpr),
/**/ BgKeikokuSpr_Init,
/**/ BgKeikokuSpr_Destroy,
/**/ BgKeikokuSpr_Update,
/**/ BgKeikokuSpr_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
+9 -9
View File
@@ -23,15 +23,15 @@ void BgKin2Bombwall_SetupEndCutscene(BgKin2Bombwall* this);
void BgKin2Bombwall_EndCutscene(BgKin2Bombwall* this, PlayState* play);
ActorInit Bg_Kin2_Bombwall_InitVars = {
ACTOR_BG_KIN2_BOMBWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Bombwall),
(ActorFunc)BgKin2Bombwall_Init,
(ActorFunc)BgKin2Bombwall_Destroy,
(ActorFunc)BgKin2Bombwall_Update,
(ActorFunc)BgKin2Bombwall_Draw,
/**/ ACTOR_BG_KIN2_BOMBWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_KIN2_OBJ,
/**/ sizeof(BgKin2Bombwall),
/**/ BgKin2Bombwall_Init,
/**/ BgKin2Bombwall_Destroy,
/**/ BgKin2Bombwall_Update,
/**/ BgKin2Bombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+9 -9
View File
@@ -28,15 +28,15 @@ void BgKin2Fence_SetupDoNothing(BgKin2Fence* this);
void BgKin2Fence_DoNothing(BgKin2Fence* this, PlayState* play);
ActorInit Bg_Kin2_Fence_InitVars = {
ACTOR_BG_KIN2_FENCE,
ACTORCAT_BG,
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Fence),
(ActorFunc)BgKin2Fence_Init,
(ActorFunc)BgKin2Fence_Destroy,
(ActorFunc)BgKin2Fence_Update,
(ActorFunc)BgKin2Fence_Draw,
/**/ ACTOR_BG_KIN2_FENCE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_KIN2_OBJ,
/**/ sizeof(BgKin2Fence),
/**/ BgKin2Fence_Init,
/**/ BgKin2Fence_Destroy,
/**/ BgKin2Fence_Update,
/**/ BgKin2Fence_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[4] = {
src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c
+9 -9
View File
@@ -28,15 +28,15 @@ void BgKin2Picture_SetupDoNothing(BgKin2Picture* this);
void BgKin2Picture_DoNothing(BgKin2Picture* this, PlayState* play);
ActorInit Bg_Kin2_Picture_InitVars = {
ACTOR_BG_KIN2_PICTURE,
ACTORCAT_PROP,
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Picture),
(ActorFunc)BgKin2Picture_Init,
(ActorFunc)BgKin2Picture_Destroy,
(ActorFunc)BgKin2Picture_Update,
(ActorFunc)BgKin2Picture_Draw,
/**/ ACTOR_BG_KIN2_PICTURE,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_KIN2_OBJ,
/**/ sizeof(BgKin2Picture),
/**/ BgKin2Picture_Init,
/**/ BgKin2Picture_Destroy,
/**/ BgKin2Picture_Update,
/**/ BgKin2Picture_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[] = {
src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c
+9 -9
View File
@@ -24,15 +24,15 @@ void func_80B70498(BgKin2Shelf* this);
void func_80B704B4(BgKin2Shelf* this, PlayState* play);
ActorInit Bg_Kin2_Shelf_InitVars = {
ACTOR_BG_KIN2_SHELF,
ACTORCAT_BG,
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Shelf),
(ActorFunc)BgKin2Shelf_Init,
(ActorFunc)BgKin2Shelf_Destroy,
(ActorFunc)BgKin2Shelf_Update,
(ActorFunc)BgKin2Shelf_Draw,
/**/ ACTOR_BG_KIN2_SHELF,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_KIN2_OBJ,
/**/ sizeof(BgKin2Shelf),
/**/ BgKin2Shelf_Init,
/**/ BgKin2Shelf_Destroy,
/**/ BgKin2Shelf_Update,
/**/ BgKin2Shelf_Draw,
};
f32 D_80B70750[] = { 60.0f, 120.0f };
src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
+9 -9
View File
@@ -21,15 +21,15 @@ void BgLadder_FadeIn(BgLadder* this, PlayState* play);
void BgLadder_DoNothing(BgLadder* this, PlayState* play);
ActorInit Bg_Ladder_InitVars = {
ACTOR_BG_LADDER,
ACTORCAT_PROP,
FLAGS,
OBJECT_LADDER,
sizeof(BgLadder),
(ActorFunc)BgLadder_Init,
(ActorFunc)BgLadder_Destroy,
(ActorFunc)BgLadder_Update,
(ActorFunc)BgLadder_Draw,
/**/ ACTOR_BG_LADDER,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_LADDER,
/**/ sizeof(BgLadder),
/**/ BgLadder_Init,
/**/ BgLadder_Destroy,
/**/ BgLadder_Update,
/**/ BgLadder_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c
+9 -9
View File
@@ -38,15 +38,15 @@ void func_80C188C4(BgLastBwall* this, PlayState* play);
void BgLastBwall_DoNothing(BgLastBwall* this, PlayState* play);
ActorInit Bg_Last_Bwall_InitVars = {
ACTOR_BG_LAST_BWALL,
ACTORCAT_BG,
FLAGS,
OBJECT_LAST_OBJ,
sizeof(BgLastBwall),
(ActorFunc)BgLastBwall_Init,
(ActorFunc)BgLastBwall_Destroy,
(ActorFunc)BgLastBwall_Update,
(ActorFunc)BgLastBwall_Draw,
/**/ ACTOR_BG_LAST_BWALL,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_LAST_OBJ,
/**/ sizeof(BgLastBwall),
/**/ BgLastBwall_Init,
/**/ BgLastBwall_Destroy,
/**/ BgLastBwall_Update,
/**/ BgLastBwall_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[] = {
src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
+9 -9
View File
@@ -16,15 +16,15 @@ void BgLbfshot_Destroy(Actor* thisx, PlayState* play);
void BgLbfshot_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Lbfshot_InitVars = {
ACTOR_BG_LBFSHOT,
ACTORCAT_BG,
FLAGS,
OBJECT_LBFSHOT,
sizeof(BgLbfshot),
(ActorFunc)BgLbfshot_Init,
(ActorFunc)BgLbfshot_Destroy,
(ActorFunc)Actor_Noop,
(ActorFunc)BgLbfshot_Draw,
/**/ ACTOR_BG_LBFSHOT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_LBFSHOT,
/**/ sizeof(BgLbfshot),
/**/ BgLbfshot_Init,
/**/ BgLbfshot_Destroy,
/**/ Actor_Noop,
/**/ BgLbfshot_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+9 -9
View File
@@ -15,15 +15,15 @@ void func_80AD6A88(BgLotus* this, PlayState* play);
void func_80AD6B68(BgLotus* this, PlayState* play);
ActorInit Bg_Lotus_InitVars = {
ACTOR_BG_LOTUS,
ACTORCAT_BG,
FLAGS,
OBJECT_LOTUS,
sizeof(BgLotus),
(ActorFunc)BgLotus_Init,
(ActorFunc)BgLotus_Destroy,
(ActorFunc)BgLotus_Update,
(ActorFunc)BgLotus_Draw,
/**/ ACTOR_BG_LOTUS,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_LOTUS,
/**/ sizeof(BgLotus),
/**/ BgLotus_Init,
/**/ BgLotus_Destroy,
/**/ BgLotus_Update,
/**/ BgLotus_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
+9 -3
View File
@@ -15,9 +15,15 @@ void BgMarketStep_Init(Actor* thisx, PlayState* play);
void BgMarketStep_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Market_Step_InitVars = {
ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS,
OBJECT_MARKET_OBJ, sizeof(BgMarketStep), (ActorFunc)BgMarketStep_Init,
(ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)BgMarketStep_Draw,
/**/ ACTOR_BG_MARKET_STEP,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MARKET_OBJ,
/**/ sizeof(BgMarketStep),
/**/ BgMarketStep_Init,
/**/ Actor_Noop,
/**/ Actor_Noop,
/**/ BgMarketStep_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
+9 -9
View File
@@ -17,15 +17,15 @@ void BgMbarChair_Update(Actor* thisx, PlayState* play);
void BgMbarChair_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Mbar_Chair_InitVars = {
ACTOR_BG_MBAR_CHAIR,
ACTORCAT_BG,
FLAGS,
OBJECT_MBAR_OBJ,
sizeof(BgMbarChair),
(ActorFunc)BgMbarChair_Init,
(ActorFunc)BgMbarChair_Destroy,
(ActorFunc)BgMbarChair_Update,
(ActorFunc)BgMbarChair_Draw,
/**/ ACTOR_BG_MBAR_CHAIR,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_MBAR_OBJ,
/**/ sizeof(BgMbarChair),
/**/ BgMbarChair_Init,
/**/ BgMbarChair_Destroy,
/**/ BgMbarChair_Update,
/**/ BgMbarChair_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c
+9 -9
View File
@@ -31,15 +31,15 @@ void BgNumaHana_SetupOpenedIdle(BgNumaHana* this);
void BgNumaHana_OpenedIdle(BgNumaHana* this, PlayState* play);
ActorInit Bg_Numa_Hana_InitVars = {
ACTOR_BG_NUMA_HANA,
ACTORCAT_BG,
FLAGS,
OBJECT_NUMA_OBJ,
sizeof(BgNumaHana),
(ActorFunc)BgNumaHana_Init,
(ActorFunc)BgNumaHana_Destroy,
(ActorFunc)BgNumaHana_Update,
(ActorFunc)BgNumaHana_Draw,
/**/ ACTOR_BG_NUMA_HANA,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_NUMA_OBJ,
/**/ sizeof(BgNumaHana),
/**/ BgNumaHana_Init,
/**/ BgNumaHana_Destroy,
/**/ BgNumaHana_Update,
/**/ BgNumaHana_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c
+9 -9
View File
@@ -28,15 +28,15 @@ typedef enum {
} BGOpenShutterDoorState;
ActorInit Bg_Open_Shutter_InitVars = {
ACTOR_BG_OPEN_SHUTTER,
ACTORCAT_DOOR,
FLAGS,
OBJECT_OPEN_OBJ,
sizeof(BgOpenShutter),
(ActorFunc)BgOpenShutter_Init,
(ActorFunc)BgOpenShutter_Destroy,
(ActorFunc)BgOpenShutter_Update,
(ActorFunc)BgOpenShutter_Draw,
/**/ ACTOR_BG_OPEN_SHUTTER,
/**/ ACTORCAT_DOOR,
/**/ FLAGS,
/**/ OBJECT_OPEN_OBJ,
/**/ sizeof(BgOpenShutter),
/**/ BgOpenShutter_Init,
/**/ BgOpenShutter_Destroy,
/**/ BgOpenShutter_Update,
/**/ BgOpenShutter_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c
+9 -9
View File
@@ -17,15 +17,15 @@ void BgOpenSpot_Update(Actor* thisx, PlayState* play);
void BgOpenSpot_Draw(Actor* thisx, PlayState* play);
ActorInit Bg_Open_Spot_InitVars = {
ACTOR_BG_OPEN_SPOT,
ACTORCAT_PROP,
FLAGS,
OBJECT_OPEN_OBJ,
sizeof(BgOpenSpot),
(ActorFunc)BgOpenSpot_Init,
(ActorFunc)BgOpenSpot_Destroy,
(ActorFunc)BgOpenSpot_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_OPEN_SPOT,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_OPEN_OBJ,
/**/ sizeof(BgOpenSpot),
/**/ BgOpenSpot_Init,
/**/ BgOpenSpot_Destroy,
/**/ BgOpenSpot_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c
+9 -9
View File
@@ -26,15 +26,15 @@ void BgSinkaiKabe_Update(Actor* thisx, PlayState* play);
void BgSinkaiKabe_WaitForPlayer(BgSinkaiKabe* this, PlayState* play);
ActorInit Bg_Sinkai_Kabe_InitVars = {
ACTOR_BG_SINKAI_KABE,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_SINKAI_KABE,
sizeof(BgSinkaiKabe),
(ActorFunc)BgSinkaiKabe_Init,
(ActorFunc)BgSinkaiKabe_Destroy,
(ActorFunc)BgSinkaiKabe_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_SINKAI_KABE,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_SINKAI_KABE,
/**/ sizeof(BgSinkaiKabe),
/**/ BgSinkaiKabe_Init,
/**/ BgSinkaiKabe_Destroy,
/**/ BgSinkaiKabe_Update,
/**/ NULL,
};
static s32 sCurrentPythonIndex = 0;
src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
+9 -9
View File
@@ -25,15 +25,15 @@ void func_809CEE74(BgSpdweb* this);
void func_809CEEAC(BgSpdweb* this, PlayState* play);
ActorInit Bg_Spdweb_InitVars = {
ACTOR_BG_SPDWEB,
ACTORCAT_BG,
FLAGS,
OBJECT_SPDWEB,
sizeof(BgSpdweb),
(ActorFunc)BgSpdweb_Init,
(ActorFunc)BgSpdweb_Destroy,
(ActorFunc)BgSpdweb_Update,
(ActorFunc)BgSpdweb_Draw,
/**/ ACTOR_BG_SPDWEB,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_SPDWEB,
/**/ sizeof(BgSpdweb),
/**/ BgSpdweb_Init,
/**/ BgSpdweb_Destroy,
/**/ BgSpdweb_Update,
/**/ BgSpdweb_Draw,
};
static ColliderTrisElementInit sTrisElementsInit1[2] = {
src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c
+9 -9
View File
@@ -23,15 +23,15 @@ void func_80A60D10(BgSpoutFire* this, PlayState* play);
void func_80A60E08(BgSpoutFire* this, PlayState* play);
ActorInit Bg_Spout_Fire_InitVars = {
ACTOR_BG_SPOUT_FIRE,
ACTORCAT_BG,
FLAGS,
OBJECT_FWALL,
sizeof(BgSpoutFire),
(ActorFunc)BgSpoutFire_Init,
(ActorFunc)BgSpoutFire_Destroy,
(ActorFunc)BgSpoutFire_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_SPOUT_FIRE,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ OBJECT_FWALL,
/**/ sizeof(BgSpoutFire),
/**/ BgSpoutFire_Init,
/**/ BgSpoutFire_Destroy,
/**/ BgSpoutFire_Update,
/**/ NULL,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
+10 -10
View File
@@ -16,16 +16,16 @@ void BgTobira01_Destroy(Actor* thisx, PlayState* play);
void BgTobira01_Update(Actor* thisx, PlayState* play);
void BgTobira01_Draw(Actor* thisx, PlayState* play);
const ActorInit Bg_Tobira01_InitVars = {
ACTOR_BG_TOBIRA01,
ACTORCAT_PROP,
FLAGS,
OBJECT_SPOT11_OBJ,
sizeof(BgTobira01),
(ActorFunc)BgTobira01_Init,
(ActorFunc)BgTobira01_Destroy,
(ActorFunc)BgTobira01_Update,
(ActorFunc)BgTobira01_Draw,
ActorInit Bg_Tobira01_InitVars = {
/**/ ACTOR_BG_TOBIRA01,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ OBJECT_SPOT11_OBJ,
/**/ sizeof(BgTobira01),
/**/ BgTobira01_Init,
/**/ BgTobira01_Destroy,
/**/ BgTobira01_Update,
/**/ BgTobira01_Draw,
};
void BgTobira01_Action(BgTobira01* this, PlayState* play) {
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
+9 -9
View File
@@ -19,15 +19,15 @@ void BgUmajump_Draw(Actor* thisx, PlayState* play);
void func_8091A5A0(Actor* thisx, PlayState* play);
ActorInit Bg_Umajump_InitVars = {
ACTOR_BG_UMAJUMP,
ACTORCAT_PROP,
FLAGS,
GAMEPLAY_KEEP,
sizeof(BgUmajump),
(ActorFunc)BgUmajump_Init,
(ActorFunc)BgUmajump_Destroy,
(ActorFunc)BgUmajump_Update,
(ActorFunc)NULL,
/**/ ACTOR_BG_UMAJUMP,
/**/ ACTORCAT_PROP,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(BgUmajump),
/**/ BgUmajump_Init,
/**/ BgUmajump_Destroy,
/**/ BgUmajump_Update,
/**/ NULL,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Boss_01/z_boss_01.c
+9 -9
View File
@@ -235,15 +235,15 @@ static ColliderCylinderInit D_809D7CA0 = {
};
ActorInit Boss_01_InitVars = {
ACTOR_BOSS_01,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS01,
sizeof(Boss01),
(ActorFunc)Boss01_Init,
(ActorFunc)Boss01_Destroy,
(ActorFunc)Boss01_Update,
(ActorFunc)Boss01_Draw,
/**/ ACTOR_BOSS_01,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS01,
/**/ sizeof(Boss01),
/**/ Boss01_Init,
/**/ Boss01_Destroy,
/**/ Boss01_Update,
/**/ Boss01_Draw,
};
#endif
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+9 -9
View File
@@ -144,15 +144,15 @@ static DamageTable sRedTwinmoldDamageTable = {
};
ActorInit Boss_02_InitVars = {
ACTOR_BOSS_02,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS02,
sizeof(Boss02),
(ActorFunc)Boss02_Init,
(ActorFunc)Boss02_Destroy,
(ActorFunc)Boss02_Twinmold_Update,
(ActorFunc)Boss02_Twinmold_Draw,
/**/ ACTOR_BOSS_02,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS02,
/**/ sizeof(Boss02),
/**/ Boss02_Init,
/**/ Boss02_Destroy,
/**/ Boss02_Twinmold_Update,
/**/ Boss02_Twinmold_Draw,
};
/**
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+9 -9
View File
@@ -276,15 +276,15 @@ Actor* Boss03_FindActorDblueMovebg(PlayState* play) {
/* Start of Gyorg's Init and actionFuncs section */
ActorInit Boss_03_InitVars = {
ACTOR_BOSS_03,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS03,
sizeof(Boss03),
(ActorFunc)Boss03_Init,
(ActorFunc)Boss03_Destroy,
(ActorFunc)Boss03_Update,
(ActorFunc)Boss03_Draw,
/**/ ACTOR_BOSS_03,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS03,
/**/ sizeof(Boss03),
/**/ Boss03_Init,
/**/ Boss03_Destroy,
/**/ Boss03_Update,
/**/ Boss03_Draw,
};
// The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw
src/overlays/actors/ovl_Boss_04/z_boss_04.c
+9 -9
View File
@@ -64,15 +64,15 @@ static DamageTable sDamageTable = {
};
ActorInit Boss_04_InitVars = {
ACTOR_BOSS_04,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS04,
sizeof(Boss04),
(ActorFunc)Boss04_Init,
(ActorFunc)Boss04_Destroy,
(ActorFunc)Boss04_Update,
(ActorFunc)Boss04_Draw,
/**/ ACTOR_BOSS_04,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS04,
/**/ sizeof(Boss04),
/**/ Boss04_Init,
/**/ Boss04_Destroy,
/**/ Boss04_Update,
/**/ Boss04_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit1[1] = {
src/overlays/actors/ovl_Boss_05/z_boss_05.c
+9 -9
View File
@@ -148,15 +148,15 @@ static DamageTable D_809F1C20 = {
};
ActorInit Boss_05_InitVars = {
ACTOR_BOSS_05,
ACTORCAT_ENEMY,
FLAGS,
OBJECT_BOSS05,
sizeof(Boss05),
(ActorFunc)Boss05_Init,
(ActorFunc)Boss05_Destroy,
(ActorFunc)Boss05_Update,
(ActorFunc)Boss05_Draw,
/**/ ACTOR_BOSS_05,
/**/ ACTORCAT_ENEMY,
/**/ FLAGS,
/**/ OBJECT_BOSS05,
/**/ sizeof(Boss05),
/**/ Boss05_Init,
/**/ Boss05_Destroy,
/**/ Boss05_Update,
/**/ Boss05_Draw,
};
#endif
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+9 -9
View File
@@ -71,15 +71,15 @@ static DamageTable sDamageTable = {
};
ActorInit Boss_06_InitVars = {
ACTOR_BOSS_06,
ACTORCAT_BOSS,
FLAGS,
OBJECT_KNIGHT,
sizeof(Boss06),
(ActorFunc)Boss06_Init,
(ActorFunc)Boss06_Destroy,
(ActorFunc)Boss06_Update,
(ActorFunc)Boss06_Draw,
/**/ ACTOR_BOSS_06,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_KNIGHT,
/**/ sizeof(Boss06),
/**/ Boss06_Init,
/**/ Boss06_Destroy,
/**/ Boss06_Update,
/**/ Boss06_Draw,
};
static ColliderCylinderInit sCylinderInit = {
src/overlays/actors/ovl_Boss_07/z_boss_07.c
+9 -9
View File
@@ -235,15 +235,15 @@ static DamageTable D_80A07A00 = {
};
ActorInit Boss_07_InitVars = {
ACTOR_BOSS_07,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS07,
sizeof(Boss07),
(ActorFunc)Boss07_Init,
(ActorFunc)Boss07_Destroy,
(ActorFunc)Boss07_Update,
(ActorFunc)Boss07_Draw,
/**/ ACTOR_BOSS_07,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS07,
/**/ sizeof(Boss07),
/**/ Boss07_Init,
/**/ Boss07_Destroy,
/**/ Boss07_Update,
/**/ Boss07_Draw,
};
// static ColliderJntSphElementInit sJntSphElementsInit[11] = {
src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c
+9 -9
View File
@@ -35,15 +35,15 @@ void func_80B0A8C4(BossHakugin* this, PlayState* play);
#if 0
ActorInit Boss_Hakugin_InitVars = {
ACTOR_BOSS_HAKUGIN,
ACTORCAT_BOSS,
FLAGS,
OBJECT_BOSS_HAKUGIN,
sizeof(BossHakugin),
(ActorFunc)BossHakugin_Init,
(ActorFunc)BossHakugin_Destroy,
(ActorFunc)BossHakugin_Update,
(ActorFunc)BossHakugin_Draw,
/**/ ACTOR_BOSS_HAKUGIN,
/**/ ACTORCAT_BOSS,
/**/ FLAGS,
/**/ OBJECT_BOSS_HAKUGIN,
/**/ sizeof(BossHakugin),
/**/ BossHakugin_Init,
/**/ BossHakugin_Destroy,
/**/ BossHakugin_Update,
/**/ BossHakugin_Draw,
};
// static ColliderJntSphElementInit sJntSphElementsInit[19] = {
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+9 -9
View File
@@ -25,15 +25,15 @@ void DemoEffect_DrawTimewarp(Actor* thisx, PlayState* play);
void DemoEffect_DrawLight(Actor* thisx, PlayState* play2);
ActorInit Demo_Effect_InitVars = {
ACTOR_DEMO_EFFECT,
ACTORCAT_BG,
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoEffect),
(ActorFunc)DemoEffect_Init,
(ActorFunc)DemoEffect_Destroy,
(ActorFunc)DemoEffect_Update,
(ActorFunc)NULL,
/**/ ACTOR_DEMO_EFFECT,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(DemoEffect),
/**/ DemoEffect_Init,
/**/ DemoEffect_Destroy,
/**/ DemoEffect_Update,
/**/ NULL,
};
void DemoEffect_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c
+9 -9
View File
@@ -19,15 +19,15 @@ void DemoGetitem_PerformCutsceneActions(DemoGetitem* this, PlayState* play);
void DemoGetitem_Draw(Actor* thisx, PlayState* play);
ActorInit Demo_Getitem_InitVars = {
ACTOR_DEMO_GETITEM,
ACTORCAT_BG,
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoGetitem),
(ActorFunc)DemoGetitem_Init,
(ActorFunc)DemoGetitem_Destroy,
(ActorFunc)DemoGetitem_Update,
(ActorFunc)NULL,
/**/ ACTOR_DEMO_GETITEM,
/**/ ACTORCAT_BG,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(DemoGetitem),
/**/ DemoGetitem_Init,
/**/ DemoGetitem_Destroy,
/**/ DemoGetitem_Update,
/**/ NULL,
};
static s16 sObjectIds[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 };
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+9 -9
View File
@@ -23,15 +23,15 @@ static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at on
static s16 sLostWoodsSkyFishParticleNum = 0;
ActorInit Demo_Kankyo_InitVars = {
ACTOR_DEMO_KANKYO,
ACTORCAT_ITEMACTION,
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoKankyo),
(ActorFunc)DemoKankyo_Init,
(ActorFunc)DemoKankyo_Destroy,
(ActorFunc)DemoKankyo_Update,
(ActorFunc)DemoKankyo_Draw,
/**/ ACTOR_DEMO_KANKYO,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(DemoKankyo),
/**/ DemoKankyo_Init,
/**/ DemoKankyo_Destroy,
/**/ DemoKankyo_Update,
/**/ DemoKankyo_Draw,
};
static s32 sObjectBubbleId = OBJECT_BUBBLE | 0x10000;
src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c
+10 -10
View File
@@ -20,16 +20,16 @@ void func_80C17B60(DemoMoonend* this, PlayState* play);
void func_80C17C48(DemoMoonend* this, PlayState* play);
void func_80C17FCC(Actor* thisx, PlayState* play);
const ActorInit Demo_Moonend_InitVars = {
ACTOR_DEMO_MOONEND,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_MOONEND,
sizeof(DemoMoonend),
(ActorFunc)DemoMoonend_Init,
(ActorFunc)DemoMoonend_Destroy,
(ActorFunc)DemoMoonend_Update,
(ActorFunc)DemoMoonend_Draw,
ActorInit Demo_Moonend_InitVars = {
/**/ ACTOR_DEMO_MOONEND,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_MOONEND,
/**/ sizeof(DemoMoonend),
/**/ DemoMoonend_Init,
/**/ DemoMoonend_Destroy,
/**/ DemoMoonend_Update,
/**/ DemoMoonend_Draw,
};
void DemoMoonend_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+9 -9
View File
@@ -16,15 +16,15 @@ void DemoShd_Update(Actor* thisx, PlayState* play);
void DemoShd_Draw(Actor* thisx, PlayState* play);
ActorInit Demo_Shd_InitVars = {
ACTOR_DEMO_SHD,
ACTORCAT_ENEMY,
FLAGS,
OBJECT_FWALL,
sizeof(DemoShd),
(ActorFunc)DemoShd_Init,
(ActorFunc)DemoShd_Destroy,
(ActorFunc)DemoShd_Update,
(ActorFunc)DemoShd_Draw,
/**/ ACTOR_DEMO_SHD,
/**/ ACTORCAT_ENEMY,
/**/ FLAGS,
/**/ OBJECT_FWALL,
/**/ sizeof(DemoShd),
/**/ DemoShd_Init,
/**/ DemoShd_Destroy,
/**/ DemoShd_Update,
/**/ DemoShd_Draw,
};
void DemoShd_Init(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c
+9 -9
View File
@@ -26,15 +26,15 @@ void func_80C173B4(Actor* thisx, PlayState* play);
void func_80C17690(Actor* thisx, PlayState* play);
ActorInit Demo_Syoten_InitVars = {
ACTOR_DEMO_SYOTEN,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_SYOTEN,
sizeof(DemoSyoten),
(ActorFunc)DemoSyoten_Init,
(ActorFunc)DemoSyoten_Destroy,
(ActorFunc)DemoSyoten_Update,
(ActorFunc)DemoSyoten_Draw,
/**/ ACTOR_DEMO_SYOTEN,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_SYOTEN,
/**/ sizeof(DemoSyoten),
/**/ DemoSyoten_Init,
/**/ DemoSyoten_Destroy,
/**/ DemoSyoten_Update,
/**/ DemoSyoten_Draw,
};
u8 D_80C177D0[] = {
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+9 -9
View File
@@ -36,15 +36,15 @@ static DemoTreLgtInfo D_808E1490[2] = {
};
ActorInit Demo_Tre_Lgt_InitVars = {
ACTOR_DEMO_TRE_LGT,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_BOX,
sizeof(DemoTreLgt),
(ActorFunc)DemoTreLgt_Init,
(ActorFunc)DemoTreLgt_Destroy,
(ActorFunc)DemoTreLgt_Update,
(ActorFunc)DemoTreLgt_Draw,
/**/ ACTOR_DEMO_TRE_LGT,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_BOX,
/**/ sizeof(DemoTreLgt),
/**/ DemoTreLgt_Init,
/**/ DemoTreLgt_Destroy,
/**/ DemoTreLgt_Update,
/**/ DemoTreLgt_Draw,
};
static CurveAnimationHeader* sBoxLightAnimations[] = {
src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c
+9 -9
View File
@@ -16,15 +16,15 @@ void DmAh_Update(Actor* thisx, PlayState* play);
void DmAh_Draw(Actor* thisx, PlayState* play);
ActorInit Dm_Ah_InitVars = {
ACTOR_DM_AH,
ACTORCAT_NPC,
FLAGS,
OBJECT_AH,
sizeof(DmAh),
(ActorFunc)DmAh_Init,
(ActorFunc)DmAh_Destroy,
(ActorFunc)DmAh_Update,
(ActorFunc)DmAh_Draw,
/**/ ACTOR_DM_AH,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_AH,
/**/ sizeof(DmAh),
/**/ DmAh_Init,
/**/ DmAh_Destroy,
/**/ DmAh_Update,
/**/ DmAh_Draw,
};
typedef enum {
src/overlays/actors/ovl_Dm_Al/z_dm_al.c
+9 -9
View File
@@ -16,15 +16,15 @@ void DmAl_Update(Actor* thisx, PlayState* play);
void DmAl_Draw(Actor* thisx, PlayState* play);
ActorInit Dm_Al_InitVars = {
ACTOR_EN_AL,
ACTORCAT_NPC,
FLAGS,
OBJECT_AL,
sizeof(DmAl),
(ActorFunc)DmAl_Init,
(ActorFunc)DmAl_Destroy,
(ActorFunc)DmAl_Update,
(ActorFunc)DmAl_Draw,
/**/ ACTOR_EN_AL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_AL,
/**/ sizeof(DmAl),
/**/ DmAl_Init,
/**/ DmAl_Destroy,
/**/ DmAl_Update,
/**/ DmAl_Draw,
};
typedef enum {
src/overlays/actors/ovl_Dm_An/z_dm_an.c
+9 -9
View File
@@ -22,15 +22,15 @@ void DmAn_DoNothing(DmAn* this, PlayState* play);
void DmAn_Draw(Actor* thisx, PlayState* play);
ActorInit Dm_An_InitVars = {
ACTOR_DM_AN,
ACTORCAT_NPC,
FLAGS,
OBJECT_AN1,
sizeof(DmAn),
(ActorFunc)DmAn_Init,
(ActorFunc)DmAn_Destroy,
(ActorFunc)DmAn_Update,
(ActorFunc)NULL,
/**/ ACTOR_DM_AN,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_AN1,
/**/ sizeof(DmAn),
/**/ DmAn_Init,
/**/ DmAn_Destroy,
/**/ DmAn_Update,
/**/ NULL,
};
/**
src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
+9 -9
View File
@@ -19,15 +19,15 @@ void DmBal_SetupDoNothing(DmBal* this);
void DmBal_DoNothing(DmBal* this, PlayState* play);
ActorInit Dm_Bal_InitVars = {
ACTOR_DM_BAL,
ACTORCAT_NPC,
FLAGS,
OBJECT_BAL,
sizeof(DmBal),
(ActorFunc)DmBal_Init,
(ActorFunc)DmBal_Destroy,
(ActorFunc)DmBal_Update,
(ActorFunc)DmBal_Draw,
/**/ ACTOR_DM_BAL,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_BAL,
/**/ sizeof(DmBal),
/**/ DmBal_Init,
/**/ DmBal_Destroy,
/**/ DmBal_Update,
/**/ DmBal_Draw,
};
// These animations are the same and in the same order as in the main NPC actor EnBal
src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c
+9 -9
View File
@@ -21,15 +21,15 @@ void func_80AA67F8(DmChar00* this, PlayState* play);
void func_80AA695C(DmChar00* this, PlayState* play);
ActorInit Dm_Char00_InitVars = {
ACTOR_DM_CHAR00,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_DELF,
sizeof(DmChar00),
(ActorFunc)DmChar00_Init,
(ActorFunc)DmChar00_Destroy,
(ActorFunc)DmChar00_Update,
(ActorFunc)DmChar00_Draw,
/**/ ACTOR_DM_CHAR00,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_DELF,
/**/ sizeof(DmChar00),
/**/ DmChar00_Init,
/**/ DmChar00_Destroy,
/**/ DmChar00_Update,
/**/ DmChar00_Draw,
};
typedef enum {
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
+9 -9
View File
@@ -37,15 +37,15 @@ s16 D_80AAAE26;
#include "overlays/ovl_Dm_Char01/ovl_Dm_Char01.c"
ActorInit Dm_Char01_InitVars = {
ACTOR_DM_CHAR01,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_MTORIDE,
sizeof(DmChar01),
(ActorFunc)DmChar01_Init,
(ActorFunc)DmChar01_Destroy,
(ActorFunc)DmChar01_Update,
(ActorFunc)DmChar01_Draw,
/**/ ACTOR_DM_CHAR01,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_MTORIDE,
/**/ sizeof(DmChar01),
/**/ DmChar01_Init,
/**/ DmChar01_Destroy,
/**/ DmChar01_Update,
/**/ DmChar01_Draw,
};
static InitChainEntry sInitChain[] = {
src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
+9 -9
View File
@@ -19,15 +19,15 @@ void DmChar02_Draw(Actor* thisx, PlayState* play);
void DmChar02_HandleCutscene(DmChar02* this, PlayState* play);
ActorInit Dm_Char02_InitVars = {
ACTOR_DM_CHAR02,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_STK2,
sizeof(DmChar02),
(ActorFunc)DmChar02_Init,
(ActorFunc)DmChar02_Destroy,
(ActorFunc)DmChar02_Update,
(ActorFunc)DmChar02_Draw,
/**/ ACTOR_DM_CHAR02,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_STK2,
/**/ sizeof(DmChar02),
/**/ DmChar02_Init,
/**/ DmChar02_Destroy,
/**/ DmChar02_Update,
/**/ DmChar02_Draw,
};
src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c
+9 -9
View File
@@ -21,15 +21,15 @@ void DmChar03_DoNothing(DmChar03* this, PlayState* play);
void func_80AABA84(PlayState* play, DmChar03* this);
ActorInit Dm_Char03_InitVars = {
ACTOR_DM_CHAR03,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_OSN,
sizeof(DmChar03),
(ActorFunc)DmChar03_Init,
(ActorFunc)DmChar03_Destroy,
(ActorFunc)DmChar03_Update,
(ActorFunc)DmChar03_Draw,
/**/ ACTOR_DM_CHAR03,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_OSN,
/**/ sizeof(DmChar03),
/**/ DmChar03_Init,
/**/ DmChar03_Destroy,
/**/ DmChar03_Update,
/**/ DmChar03_Draw,
};
typedef enum {
src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c
+9 -9
View File
@@ -19,15 +19,15 @@ void DmChar04_Draw(Actor* thisx, PlayState* play);
void DmChar04_HandleCutscene(DmChar04* this, PlayState* play);
ActorInit Dm_Char04_InitVars = {
ACTOR_DM_CHAR04,
ACTORCAT_ITEMACTION,
FLAGS,
GAMEPLAY_KEEP,
sizeof(DmChar04),
(ActorFunc)DmChar04_Init,
(ActorFunc)DmChar04_Destroy,
(ActorFunc)DmChar04_Update,
(ActorFunc)DmChar04_Draw,
/**/ ACTOR_DM_CHAR04,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ GAMEPLAY_KEEP,
/**/ sizeof(DmChar04),
/**/ DmChar04_Init,
/**/ DmChar04_Destroy,
/**/ DmChar04_Update,
/**/ DmChar04_Draw,
};
typedef enum {
src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c
+9 -9
View File
@@ -36,15 +36,15 @@ void func_80AAE030(PlayState* play, DmChar05* this);
void func_80AAE114(PlayState* play, DmChar05* this);
ActorInit Dm_Char05_InitVars = {
ACTOR_DM_CHAR05,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_DMASK,
sizeof(DmChar05),
(ActorFunc)DmChar05_Init,
(ActorFunc)DmChar05_Destroy,
(ActorFunc)DmChar05_Update,
(ActorFunc)DmChar05_Draw,
/**/ ACTOR_DM_CHAR05,
/**/ ACTORCAT_ITEMACTION,
/**/ FLAGS,
/**/ OBJECT_DMASK,
/**/ sizeof(DmChar05),
/**/ DmChar05_Init,
/**/ DmChar05_Destroy,
/**/ DmChar05_Update,
/**/ DmChar05_Draw,
};
typedef enum {

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