Remove ActorFunc cast

This commit is contained in:
Angie
2022-11-13 20:53:24 -03:00
parent a0c65bb3c6
commit 7da80ae27f
579 changed files with 2313 additions and 2313 deletions
+4 -4
View File
@@ -32,10 +32,10 @@ ActorInit En_Ms_InitVars = {
FLAGS,
OBJECT_MS,
sizeof(EnMs),
(ActorFunc)EnMs_Init,
(ActorFunc)EnMs_Destroy,
(ActorFunc)EnMs_Update,
(ActorFunc)EnMs_Draw,
EnMs_Init,
EnMs_Destroy,
EnMs_Update,
EnMs_Draw,
};
static ColliderCylinderInitType1 D_80952BA0 = {
+8 -8
View File
@@ -33,10 +33,10 @@ ActorInit En_Recepgirl_InitVars = {
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
EnRecepgirl_Init,
EnRecepgirl_Destroy,
EnRecepgirl_Update,
EnRecepgirl_Draw,
};
// static InitChainEntry sInitChain[] = {
@@ -341,10 +341,10 @@ ActorInit En_Recepgirl_InitVars = {
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
EnRecepgirl_Init,
EnRecepgirl_Destroy,
EnRecepgirl_Update,
EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
+8 -8
View File
@@ -49,10 +49,10 @@ ActorInit En_Recepgirl_InitVars = {
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
EnRecepgirl_Init,
EnRecepgirl_Destroy,
EnRecepgirl_Update,
EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -105,10 +105,10 @@ ActorInit En_Recepgirl_InitVars = {
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
EnRecepgirl_Init,
EnRecepgirl_Destroy,
EnRecepgirl_Update,
EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
+4 -4
View File
@@ -54,10 +54,10 @@ ActorInit En_Recepgirl_InitVars = {
FLAGS,
OBJECT_BG,
sizeof(EnRecepgirl),
(ActorFunc)EnRecepgirl_Init,
(ActorFunc)EnRecepgirl_Destroy,
(ActorFunc)EnRecepgirl_Update,
(ActorFunc)EnRecepgirl_Draw,
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 };
+4 -4
View File
@@ -29,10 +29,10 @@ ActorInit En_Item00_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(EnItem00),
(ActorFunc)EnItem00_Init,
(ActorFunc)EnItem00_Destroy,
(ActorFunc)EnItem00_Update,
(ActorFunc)EnItem00_Draw,
EnItem00_Init,
EnItem00_Destroy,
EnItem00_Update,
EnItem00_Draw,
};
static ColliderCylinderInit sCylinderInit = {
+4 -4
View File
@@ -20,10 +20,10 @@ ActorInit Player_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(Player),
(ActorFunc)PlayerCall_Init,
(ActorFunc)PlayerCall_Destroy,
(ActorFunc)PlayerCall_Update,
(ActorFunc)PlayerCall_Draw,
PlayerCall_Init,
PlayerCall_Destroy,
PlayerCall_Update,
PlayerCall_Draw,
};
void Player_Init(Actor* thisx, PlayState* play);
@@ -26,10 +26,10 @@ ActorInit Arms_Hook_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArmsHook),
(ActorFunc)ArmsHook_Init,
(ActorFunc)ArmsHook_Destroy,
(ActorFunc)ArmsHook_Update,
(ActorFunc)ArmsHook_Draw,
ArmsHook_Init,
ArmsHook_Destroy,
ArmsHook_Update,
ArmsHook_Draw,
};
static ColliderQuadInit D_808C1BC0 = {
@@ -27,10 +27,10 @@ ActorInit Arrow_Fire_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowFire),
(ActorFunc)ArrowFire_Init,
(ActorFunc)ArrowFire_Destroy,
(ActorFunc)ArrowFire_Update,
(ActorFunc)ArrowFire_Draw,
ArrowFire_Init,
ArrowFire_Destroy,
ArrowFire_Update,
ArrowFire_Draw,
};
static ColliderQuadInit sQuadInit = {
@@ -29,10 +29,10 @@ ActorInit Arrow_Ice_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowIce),
(ActorFunc)ArrowIce_Init,
(ActorFunc)ArrowIce_Destroy,
(ActorFunc)ArrowIce_Update,
(ActorFunc)ArrowIce_Draw,
ArrowIce_Init,
ArrowIce_Destroy,
ArrowIce_Update,
ArrowIce_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -27,10 +27,10 @@ ActorInit Arrow_Light_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(ArrowLight),
(ActorFunc)ArrowLight_Init,
(ActorFunc)ArrowLight_Destroy,
(ActorFunc)ArrowLight_Update,
(ActorFunc)ArrowLight_Draw,
ArrowLight_Init,
ArrowLight_Destroy,
ArrowLight_Update,
ArrowLight_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -29,10 +29,10 @@ ActorInit Bg_Astr_Bombwall_InitVars = {
FLAGS,
OBJECT_ASTR_OBJ,
sizeof(BgAstrBombwall),
(ActorFunc)BgAstrBombwall_Init,
(ActorFunc)BgAstrBombwall_Destroy,
(ActorFunc)BgAstrBombwall_Update,
(ActorFunc)BgAstrBombwall_Draw,
BgAstrBombwall_Init,
BgAstrBombwall_Destroy,
BgAstrBombwall_Update,
BgAstrBombwall_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[2] = {
@@ -24,10 +24,10 @@ ActorInit Bg_Botihasira_InitVars = {
FLAGS,
OBJECT_BOTIHASIRA,
sizeof(BgBotihasira),
(ActorFunc)BgBotihasira_Init,
(ActorFunc)BgBotihasira_Destroy,
(ActorFunc)BgBotihasira_Update,
(ActorFunc)BgBotihasira_Draw,
BgBotihasira_Init,
BgBotihasira_Destroy,
BgBotihasira_Update,
BgBotihasira_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -47,8 +47,8 @@ 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,
GAMEPLAY_KEEP, sizeof(BgBreakwall), BgBreakwall_Init,
NULL, BgBreakwall_Update, NULL,
};
typedef struct {
@@ -47,10 +47,10 @@ ActorInit Bg_Crace_Movebg_InitVars = {
FLAGS,
OBJECT_CRACE_OBJECT,
sizeof(BgCraceMovebg),
(ActorFunc)BgCraceMovebg_Init,
(ActorFunc)BgCraceMovebg_Destroy,
(ActorFunc)BgCraceMovebg_Update,
(ActorFunc)BgCraceMovebg_Draw,
BgCraceMovebg_Init,
BgCraceMovebg_Destroy,
BgCraceMovebg_Update,
BgCraceMovebg_Draw,
};
static u8 sHasInitializedIsLoaded = 0;
@@ -25,10 +25,10 @@ ActorInit Bg_Ctower_Gear_InitVars = {
FLAGS,
OBJECT_CTOWER_ROT,
sizeof(BgCtowerGear),
(ActorFunc)BgCtowerGear_Init,
(ActorFunc)BgCtowerGear_Destroy,
(ActorFunc)BgCtowerGear_Update,
(ActorFunc)BgCtowerGear_Draw,
BgCtowerGear_Init,
BgCtowerGear_Destroy,
BgCtowerGear_Update,
BgCtowerGear_Draw,
};
static Vec3f sExitSplashOffsets[] = {
@@ -27,10 +27,10 @@ ActorInit Bg_Ctower_Rot_InitVars = {
FLAGS,
OBJECT_CTOWER_ROT,
sizeof(BgCtowerRot),
(ActorFunc)BgCtowerRot_Init,
(ActorFunc)BgCtowerRot_Destroy,
(ActorFunc)BgCtowerRot_Update,
(ActorFunc)BgCtowerRot_Draw,
BgCtowerRot_Init,
BgCtowerRot_Destroy,
BgCtowerRot_Update,
BgCtowerRot_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -21,10 +21,10 @@ ActorInit Bg_Danpei_Movebg_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(BgDanpeiMovebg),
(ActorFunc)BgDanpeiMovebg_Init,
(ActorFunc)BgDanpeiMovebg_Destroy,
(ActorFunc)BgDanpeiMovebg_Update,
(ActorFunc)NULL,
BgDanpeiMovebg_Init,
BgDanpeiMovebg_Destroy,
BgDanpeiMovebg_Update,
NULL,
};
// static InitChainEntry sInitChain[] = {
@@ -36,10 +36,10 @@ ActorInit Bg_Dblue_Balance_InitVars = {
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueBalance),
(ActorFunc)BgDblueBalance_Init,
(ActorFunc)BgDblueBalance_Destroy,
(ActorFunc)BgDblueBalance_Update,
(ActorFunc)BgDblueBalance_Draw,
BgDblueBalance_Init,
BgDblueBalance_Destroy,
BgDblueBalance_Update,
BgDblueBalance_Draw,
};
typedef struct {
@@ -22,10 +22,10 @@ ActorInit Bg_Dblue_Elevator_InitVars = {
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueElevator),
(ActorFunc)BgDblueElevator_Init,
(ActorFunc)BgDblueElevator_Destroy,
(ActorFunc)BgDblueElevator_Update,
(ActorFunc)BgDblueElevator_Draw,
BgDblueElevator_Init,
BgDblueElevator_Destroy,
BgDblueElevator_Update,
BgDblueElevator_Draw,
};
// static InitChainEntry sInitChain[] = {
@@ -51,10 +51,10 @@ ActorInit Bg_Dblue_Movebg_InitVars = {
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueMovebg),
(ActorFunc)BgDblueMovebg_Init,
(ActorFunc)BgDblueMovebg_Destroy,
(ActorFunc)BgDblueMovebg_Update,
(ActorFunc)BgDblueMovebg_Draw,
BgDblueMovebg_Init,
BgDblueMovebg_Destroy,
BgDblueMovebg_Update,
BgDblueMovebg_Draw,
};
static Gfx* sOpaDLists[] = {
@@ -31,10 +31,10 @@ ActorInit Bg_Dblue_Waterfall_InitVars = {
FLAGS,
OBJECT_DBLUE_OBJECT,
sizeof(BgDblueWaterfall),
(ActorFunc)BgDblueWaterfall_Init,
(ActorFunc)BgDblueWaterfall_Destroy,
(ActorFunc)BgDblueWaterfall_Update,
(ActorFunc)BgDblueWaterfall_Draw,
BgDblueWaterfall_Init,
BgDblueWaterfall_Destroy,
BgDblueWaterfall_Update,
BgDblueWaterfall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -30,10 +30,10 @@ ActorInit Bg_Dkjail_Ivy_InitVars = {
FLAGS,
OBJECT_DKJAIL_OBJ,
sizeof(BgDkjailIvy),
(ActorFunc)BgDkjailIvy_Init,
(ActorFunc)BgDkjailIvy_Destroy,
(ActorFunc)BgDkjailIvy_Update,
(ActorFunc)BgDkjailIvy_Draw,
BgDkjailIvy_Init,
BgDkjailIvy_Destroy,
BgDkjailIvy_Update,
BgDkjailIvy_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -32,10 +32,10 @@ ActorInit Bg_Dy_Yoseizo_InitVars = {
FLAGS,
OBJECT_DY_OBJ,
sizeof(BgDyYoseizo),
(ActorFunc)BgDyYoseizo_Init,
(ActorFunc)BgDyYoseizo_Destroy,
(ActorFunc)BgDyYoseizo_Update,
(ActorFunc)NULL,
BgDyYoseizo_Init,
BgDyYoseizo_Destroy,
BgDyYoseizo_Update,
NULL,
};
#endif
@@ -32,10 +32,10 @@ ActorInit Bg_F40_Block_InitVars = {
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Block),
(ActorFunc)BgF40Block_Init,
(ActorFunc)BgF40Block_Destroy,
(ActorFunc)BgF40Block_Update,
(ActorFunc)BgF40Block_Draw,
BgF40Block_Init,
BgF40Block_Destroy,
BgF40Block_Update,
BgF40Block_Draw,
};
static Vec3f D_80BC4620[] = {
@@ -25,10 +25,10 @@ ActorInit Bg_F40_Flift_InitVars = {
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Flift),
(ActorFunc)BgF40Flift_Init,
(ActorFunc)BgF40Flift_Destroy,
(ActorFunc)BgF40Flift_Update,
(ActorFunc)BgF40Flift_Draw,
BgF40Flift_Init,
BgF40Flift_Destroy,
BgF40Flift_Update,
BgF40Flift_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -30,10 +30,10 @@ ActorInit Bg_F40_Switch_InitVars = {
FLAGS,
OBJECT_F40_SWITCH,
sizeof(BgF40Switch),
(ActorFunc)BgF40Switch_Init,
(ActorFunc)BgF40Switch_Destroy,
(ActorFunc)BgF40Switch_Update,
(ActorFunc)BgF40Switch_Draw,
BgF40Switch_Init,
BgF40Switch_Destroy,
BgF40Switch_Update,
BgF40Switch_Draw,
};
s32 sBgF40SwitchGlobalsInitialized = false;
@@ -22,10 +22,10 @@ ActorInit Bg_F40_Swlift_InitVars = {
FLAGS,
OBJECT_F40_OBJ,
sizeof(BgF40Swlift),
(ActorFunc)BgF40Swlift_Init,
(ActorFunc)BgF40Swlift_Destroy,
(ActorFunc)BgF40Swlift_Update,
(ActorFunc)BgF40Swlift_Draw,
BgF40Swlift_Init,
BgF40Swlift_Destroy,
BgF40Swlift_Update,
BgF40Swlift_Draw,
};
// static InitChainEntry sInitChain[] = {
@@ -27,10 +27,10 @@ ActorInit Bg_Fire_Wall_InitVars = {
FLAGS,
OBJECT_FWALL,
sizeof(BgFireWall),
(ActorFunc)BgFireWall_Init,
(ActorFunc)BgFireWall_Destroy,
(ActorFunc)BgFireWall_Update,
(ActorFunc)NULL,
BgFireWall_Init,
BgFireWall_Destroy,
BgFireWall_Update,
NULL,
};
static ColliderCylinderInit sCylinderInit = {
@@ -22,10 +22,10 @@ ActorInit Bg_Fu_Kaiten_InitVars = {
FLAGS,
OBJECT_FU_KAITEN,
sizeof(BgFuKaiten),
(ActorFunc)BgFuKaiten_Init,
(ActorFunc)BgFuKaiten_Destroy,
(ActorFunc)BgFuKaiten_Update,
(ActorFunc)BgFuKaiten_Draw,
BgFuKaiten_Init,
BgFuKaiten_Destroy,
BgFuKaiten_Update,
BgFuKaiten_Draw,
};
void BgFuKaiten_Init(Actor* thisx, PlayState* play) {
@@ -22,10 +22,10 @@ ActorInit Bg_Fu_Mizu_InitVars = {
FLAGS,
OBJECT_FU_KAITEN,
sizeof(BgFuMizu),
(ActorFunc)BgFuMizu_Init,
(ActorFunc)BgFuMizu_Destroy,
(ActorFunc)BgFuMizu_Update,
(ActorFunc)BgFuMizu_Draw,
BgFuMizu_Init,
BgFuMizu_Destroy,
BgFuMizu_Update,
BgFuMizu_Draw,
};
void BgFuMizu_Init(Actor* thisx, PlayState* play) {
@@ -29,10 +29,10 @@ ActorInit Bg_Goron_Oyu_InitVars = {
FLAGS,
OBJECT_OYU,
sizeof(BgGoronOyu),
(ActorFunc)BgGoronOyu_Init,
(ActorFunc)BgGoronOyu_Destroy,
(ActorFunc)BgGoronOyu_Update,
(ActorFunc)BgGoronOyu_Draw,
BgGoronOyu_Init,
BgGoronOyu_Destroy,
BgGoronOyu_Update,
BgGoronOyu_Draw,
};
void func_80B40080(BgGoronOyu* this) {
@@ -30,10 +30,10 @@ ActorInit Bg_Haka_Bombwall_InitVars = {
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaBombwall),
(ActorFunc)BgHakaBombwall_Init,
(ActorFunc)BgHakaBombwall_Destroy,
(ActorFunc)BgHakaBombwall_Update,
(ActorFunc)BgHakaBombwall_Draw,
BgHakaBombwall_Init,
BgHakaBombwall_Destroy,
BgHakaBombwall_Update,
BgHakaBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -32,10 +32,10 @@ ActorInit Bg_Haka_Curtain_InitVars = {
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaCurtain),
(ActorFunc)BgHakaCurtain_Init,
(ActorFunc)BgHakaCurtain_Destroy,
(ActorFunc)BgHakaCurtain_Update,
(ActorFunc)BgHakaCurtain_Draw,
BgHakaCurtain_Init,
BgHakaCurtain_Destroy,
BgHakaCurtain_Update,
BgHakaCurtain_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -29,10 +29,10 @@ ActorInit Bg_Haka_Tomb_InitVars = {
FLAGS,
OBJECT_HAKA_OBJ,
sizeof(BgHakaTomb),
(ActorFunc)BgHakaTomb_Init,
(ActorFunc)BgHakaTomb_Destroy,
(ActorFunc)BgHakaTomb_Update,
(ActorFunc)BgHakaTomb_Draw,
BgHakaTomb_Init,
BgHakaTomb_Destroy,
BgHakaTomb_Update,
BgHakaTomb_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -32,10 +32,10 @@ ActorInit Bg_Hakugin_Bombwall_InitVars = {
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginBombwall),
(ActorFunc)BgHakuginBombwall_Init,
(ActorFunc)BgHakuginBombwall_Destroy,
(ActorFunc)BgHakuginBombwall_Update,
(ActorFunc)BgHakuginBombwall_Draw,
BgHakuginBombwall_Init,
BgHakuginBombwall_Destroy,
BgHakuginBombwall_Update,
BgHakuginBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -24,10 +24,10 @@ ActorInit Bg_Hakugin_Elvpole_InitVars = {
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginElvpole),
(ActorFunc)BgHakuginElvpole_Init,
(ActorFunc)BgHakuginElvpole_Destroy,
(ActorFunc)BgHakuginElvpole_Update,
(ActorFunc)BgHakuginElvpole_Draw,
BgHakuginElvpole_Init,
BgHakuginElvpole_Destroy,
BgHakuginElvpole_Update,
BgHakuginElvpole_Draw,
};
void BgHakuginElvpole_Init(Actor* thisx, PlayState* play) {
@@ -45,10 +45,10 @@ ActorInit Bg_Hakugin_Post_InitVars = {
FLAGS,
OBJECT_HAKUGIN_OBJ,
sizeof(BgHakuginPost),
(ActorFunc)BgHakuginPost_Init,
(ActorFunc)BgHakuginPost_Destroy,
(ActorFunc)BgHakuginPost_Update,
(ActorFunc)NULL,
BgHakuginPost_Init,
BgHakuginPost_Destroy,
BgHakuginPost_Update,
NULL,
};
typedef struct {
@@ -44,10 +44,10 @@ ActorInit Bg_Hakugin_Switch_InitVars = {
FLAGS,
OBJECT_GORONSWITCH,
sizeof(BgHakuginSwitch),
(ActorFunc)BgHakuginSwitch_Init,
(ActorFunc)BgHakuginSwitch_Destroy,
(ActorFunc)BgHakuginSwitch_Update,
(ActorFunc)BgHakuginSwitch_Draw,
BgHakuginSwitch_Init,
BgHakuginSwitch_Destroy,
BgHakuginSwitch_Update,
BgHakuginSwitch_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -29,10 +29,10 @@ ActorInit Bg_Icefloe_InitVars = {
FLAGS,
OBJECT_ICEFLOE,
sizeof(BgIcefloe),
(ActorFunc)BgIcefloe_Init,
(ActorFunc)BgIcefloe_Destroy,
(ActorFunc)BgIcefloe_Update,
(ActorFunc)BgIcefloe_Draw,
BgIcefloe_Init,
BgIcefloe_Destroy,
BgIcefloe_Update,
BgIcefloe_Draw,
};
static BgIcefloe* sSpawnedInstances[] = { NULL, NULL, NULL };
@@ -48,10 +48,10 @@ ActorInit Bg_Icicle_InitVars = {
FLAGS,
OBJECT_ICICLE,
sizeof(BgIcicle),
(ActorFunc)BgIcicle_Init,
(ActorFunc)BgIcicle_Destroy,
(ActorFunc)BgIcicle_Update,
(ActorFunc)BgIcicle_Draw,
BgIcicle_Init,
BgIcicle_Destroy,
BgIcicle_Update,
BgIcicle_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -31,10 +31,10 @@ ActorInit Bg_Ikana_Block_InitVars = {
FLAGS,
GAMEPLAY_DANGEON_KEEP,
sizeof(BgIkanaBlock),
(ActorFunc)BgIkanaBlock_Init,
(ActorFunc)BgIkanaBlock_Destroy,
(ActorFunc)BgIkanaBlock_Update,
(ActorFunc)NULL,
BgIkanaBlock_Init,
BgIkanaBlock_Destroy,
BgIkanaBlock_Update,
NULL,
};
static InitChainEntry sInitChain[] = {
@@ -31,10 +31,10 @@ ActorInit Bg_Ikana_Bombwall_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaBombwall),
(ActorFunc)BgIkanaBombwall_Init,
(ActorFunc)BgIkanaBombwall_Destroy,
(ActorFunc)BgIkanaBombwall_Update,
(ActorFunc)BgIkanaBombwall_Draw,
BgIkanaBombwall_Init,
BgIkanaBombwall_Destroy,
BgIkanaBombwall_Update,
BgIkanaBombwall_Draw,
};
static ColliderCylinderInit sCylinderInit1 = {
@@ -30,10 +30,10 @@ ActorInit Bg_Ikana_Dharma_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaDharma),
(ActorFunc)BgIkanaDharma_Init,
(ActorFunc)BgIkanaDharma_Destroy,
(ActorFunc)BgIkanaDharma_Update,
(ActorFunc)BgIkanaDharma_Draw,
BgIkanaDharma_Init,
BgIkanaDharma_Destroy,
BgIkanaDharma_Update,
BgIkanaDharma_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -32,10 +32,10 @@ ActorInit Bg_Ikana_Mirror_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaMirror),
(ActorFunc)BgIkanaMirror_Init,
(ActorFunc)BgIkanaMirror_Destroy,
(ActorFunc)BgIkanaMirror_Update,
(ActorFunc)BgIkanaMirror_Draw,
BgIkanaMirror_Init,
BgIkanaMirror_Destroy,
BgIkanaMirror_Update,
BgIkanaMirror_Draw,
};
static ColliderTrisElementInit sMirrorColliderElementsInit[] = {
@@ -27,10 +27,10 @@ ActorInit Bg_Ikana_Ray_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaRay),
(ActorFunc)BgIkanaRay_Init,
(ActorFunc)BgIkanaRay_Destroy,
(ActorFunc)BgIkanaRay_Update,
(ActorFunc)BgIkanaRay_Draw,
BgIkanaRay_Init,
BgIkanaRay_Destroy,
BgIkanaRay_Update,
BgIkanaRay_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -40,10 +40,10 @@ ActorInit Bg_Ikana_Rotaryroom_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaRotaryroom),
(ActorFunc)BgIkanaRotaryroom_Init,
(ActorFunc)BgIkanaRotaryroom_Destroy,
(ActorFunc)BgIkanaRotaryroom_Update,
(ActorFunc)BgIkanaRotaryroom_Draw,
BgIkanaRotaryroom_Init,
BgIkanaRotaryroom_Destroy,
BgIkanaRotaryroom_Update,
BgIkanaRotaryroom_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit1[2] = {
@@ -42,10 +42,10 @@ ActorInit Bg_Ikana_Shutter_InitVars = {
FLAGS,
OBJECT_IKANA_OBJ,
sizeof(BgIkanaShutter),
(ActorFunc)BgIkanaShutter_Init,
(ActorFunc)BgIkanaShutter_Destroy,
(ActorFunc)BgIkanaShutter_Update,
(ActorFunc)BgIkanaShutter_Draw,
BgIkanaShutter_Init,
BgIkanaShutter_Destroy,
BgIkanaShutter_Update,
BgIkanaShutter_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -35,10 +35,10 @@ ActorInit Bg_Iknin_Susceil_InitVars = {
FLAGS,
OBJECT_IKNINSIDE_OBJ,
sizeof(BgIkninSusceil),
(ActorFunc)BgIkninSusceil_Init,
(ActorFunc)BgIkninSusceil_Destroy,
(ActorFunc)BgIkninSusceil_Update,
(ActorFunc)BgIkninSusceil_Draw,
BgIkninSusceil_Init,
BgIkninSusceil_Destroy,
BgIkninSusceil_Update,
BgIkninSusceil_Draw,
};
static s32 unused = 0;
@@ -24,10 +24,10 @@ ActorInit Bg_Ikninside_InitVars = {
FLAGS,
OBJECT_IKNINSIDE_OBJ,
sizeof(BgIkninside),
(ActorFunc)BgIkninside_Init,
(ActorFunc)BgIkninside_Destroy,
(ActorFunc)BgIkninside_Update,
(ActorFunc)BgIkninside_Draw,
BgIkninside_Init,
BgIkninside_Destroy,
BgIkninside_Update,
BgIkninside_Draw,
};
static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 };
@@ -33,10 +33,10 @@ ActorInit Bg_Iknv_Doukutu_InitVars = {
FLAGS,
OBJECT_IKNV_OBJ,
sizeof(BgIknvDoukutu),
(ActorFunc)BgIknvDoukutu_Init,
(ActorFunc)BgIknvDoukutu_Destroy,
(ActorFunc)BgIknvDoukutu_Update,
(ActorFunc)BgIknvDoukutu_Draw,
BgIknvDoukutu_Init,
BgIknvDoukutu_Destroy,
BgIknvDoukutu_Update,
BgIknvDoukutu_Draw,
};
void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) {
@@ -27,10 +27,10 @@ ActorInit Bg_Iknv_Obj_InitVars = {
FLAGS,
OBJECT_IKNV_OBJ,
sizeof(BgIknvObj),
(ActorFunc)BgIknvObj_Init,
(ActorFunc)BgIknvObj_Destroy,
(ActorFunc)BgIknvObj_Update,
(ActorFunc)BgIknvObj_Draw,
BgIknvObj_Init,
BgIknvObj_Destroy,
BgIknvObj_Update,
BgIknvObj_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -32,10 +32,10 @@ ActorInit Bg_Ingate_InitVars = {
FLAGS,
OBJECT_SICHITAI_OBJ,
sizeof(BgIngate),
(ActorFunc)BgIngate_Init,
(ActorFunc)BgIngate_Destroy,
(ActorFunc)BgIngate_Update,
(ActorFunc)BgIngate_Draw,
BgIngate_Init,
BgIngate_Destroy,
BgIngate_Update,
BgIngate_Draw,
};
/**
@@ -21,10 +21,10 @@ ActorInit Bg_Inibs_Movebg_InitVars = {
FLAGS,
OBJECT_INIBS_OBJECT,
sizeof(BgInibsMovebg),
(ActorFunc)BgInibsMovebg_Init,
(ActorFunc)BgInibsMovebg_Destroy,
(ActorFunc)Actor_Noop,
(ActorFunc)BgInibsMovebg_Draw,
BgInibsMovebg_Init,
BgInibsMovebg_Destroy,
Actor_Noop,
BgInibsMovebg_Draw,
};
Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL };
@@ -26,10 +26,10 @@ ActorInit Bg_Keikoku_Saku_InitVars = {
FLAGS,
OBJECT_KEIKOKU_OBJ,
sizeof(BgKeikokuSaku),
(ActorFunc)BgKeikokuSaku_Init,
(ActorFunc)BgKeikokuSaku_Destroy,
(ActorFunc)BgKeikokuSaku_Update,
(ActorFunc)BgKeikokuSaku_Draw,
BgKeikokuSaku_Init,
BgKeikokuSaku_Destroy,
BgKeikokuSaku_Update,
BgKeikokuSaku_Draw,
};
void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) {
@@ -22,10 +22,10 @@ ActorInit Bg_Keikoku_Spr_InitVars = {
FLAGS,
OBJECT_KEIKOKU_OBJ,
sizeof(BgKeikokuSpr),
(ActorFunc)BgKeikokuSpr_Init,
(ActorFunc)BgKeikokuSpr_Destroy,
(ActorFunc)BgKeikokuSpr_Update,
(ActorFunc)BgKeikokuSpr_Draw,
BgKeikokuSpr_Init,
BgKeikokuSpr_Destroy,
BgKeikokuSpr_Update,
BgKeikokuSpr_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -28,10 +28,10 @@ ActorInit Bg_Kin2_Bombwall_InitVars = {
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Bombwall),
(ActorFunc)BgKin2Bombwall_Init,
(ActorFunc)BgKin2Bombwall_Destroy,
(ActorFunc)BgKin2Bombwall_Update,
(ActorFunc)BgKin2Bombwall_Draw,
BgKin2Bombwall_Init,
BgKin2Bombwall_Destroy,
BgKin2Bombwall_Update,
BgKin2Bombwall_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -33,10 +33,10 @@ ActorInit Bg_Kin2_Fence_InitVars = {
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Fence),
(ActorFunc)BgKin2Fence_Init,
(ActorFunc)BgKin2Fence_Destroy,
(ActorFunc)BgKin2Fence_Update,
(ActorFunc)BgKin2Fence_Draw,
BgKin2Fence_Init,
BgKin2Fence_Destroy,
BgKin2Fence_Update,
BgKin2Fence_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit[4] = {
@@ -33,10 +33,10 @@ ActorInit Bg_Kin2_Picture_InitVars = {
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Picture),
(ActorFunc)BgKin2Picture_Init,
(ActorFunc)BgKin2Picture_Destroy,
(ActorFunc)BgKin2Picture_Update,
(ActorFunc)BgKin2Picture_Draw,
BgKin2Picture_Init,
BgKin2Picture_Destroy,
BgKin2Picture_Update,
BgKin2Picture_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[] = {
@@ -29,10 +29,10 @@ ActorInit Bg_Kin2_Shelf_InitVars = {
FLAGS,
OBJECT_KIN2_OBJ,
sizeof(BgKin2Shelf),
(ActorFunc)BgKin2Shelf_Init,
(ActorFunc)BgKin2Shelf_Destroy,
(ActorFunc)BgKin2Shelf_Update,
(ActorFunc)BgKin2Shelf_Draw,
BgKin2Shelf_Init,
BgKin2Shelf_Destroy,
BgKin2Shelf_Update,
BgKin2Shelf_Draw,
};
f32 D_80B70750[] = { 60.0f, 120.0f };
@@ -26,10 +26,10 @@ ActorInit Bg_Ladder_InitVars = {
FLAGS,
OBJECT_LADDER,
sizeof(BgLadder),
(ActorFunc)BgLadder_Init,
(ActorFunc)BgLadder_Destroy,
(ActorFunc)BgLadder_Update,
(ActorFunc)BgLadder_Draw,
BgLadder_Init,
BgLadder_Destroy,
BgLadder_Update,
BgLadder_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -43,10 +43,10 @@ ActorInit Bg_Last_Bwall_InitVars = {
FLAGS,
OBJECT_LAST_OBJ,
sizeof(BgLastBwall),
(ActorFunc)BgLastBwall_Init,
(ActorFunc)BgLastBwall_Destroy,
(ActorFunc)BgLastBwall_Update,
(ActorFunc)BgLastBwall_Draw,
BgLastBwall_Init,
BgLastBwall_Destroy,
BgLastBwall_Update,
BgLastBwall_Draw,
};
static ColliderTrisElementInit sTrisElementsInit[] = {
@@ -21,10 +21,10 @@ ActorInit Bg_Lbfshot_InitVars = {
FLAGS,
OBJECT_LBFSHOT,
sizeof(BgLbfshot),
(ActorFunc)BgLbfshot_Init,
(ActorFunc)BgLbfshot_Destroy,
(ActorFunc)Actor_Noop,
(ActorFunc)BgLbfshot_Draw,
BgLbfshot_Init,
BgLbfshot_Destroy,
Actor_Noop,
BgLbfshot_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -26,10 +26,10 @@ ActorInit Bg_Lotus_InitVars = {
FLAGS,
OBJECT_LOTUS,
sizeof(BgLotus),
(ActorFunc)BgLotus_Init,
(ActorFunc)BgLotus_Destroy,
(ActorFunc)BgLotus_Update,
(ActorFunc)BgLotus_Draw,
BgLotus_Init,
BgLotus_Destroy,
BgLotus_Update,
BgLotus_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -16,8 +16,8 @@ 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,
OBJECT_MARKET_OBJ, sizeof(BgMarketStep), BgMarketStep_Init,
Actor_Noop, Actor_Noop, BgMarketStep_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -22,10 +22,10 @@ ActorInit Bg_Mbar_Chair_InitVars = {
FLAGS,
OBJECT_MBAR_OBJ,
sizeof(BgMbarChair),
(ActorFunc)BgMbarChair_Init,
(ActorFunc)BgMbarChair_Destroy,
(ActorFunc)BgMbarChair_Update,
(ActorFunc)BgMbarChair_Draw,
BgMbarChair_Init,
BgMbarChair_Destroy,
BgMbarChair_Update,
BgMbarChair_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -36,10 +36,10 @@ ActorInit Bg_Numa_Hana_InitVars = {
FLAGS,
OBJECT_NUMA_OBJ,
sizeof(BgNumaHana),
(ActorFunc)BgNumaHana_Init,
(ActorFunc)BgNumaHana_Destroy,
(ActorFunc)BgNumaHana_Update,
(ActorFunc)BgNumaHana_Draw,
BgNumaHana_Init,
BgNumaHana_Destroy,
BgNumaHana_Update,
BgNumaHana_Draw,
};
static ColliderCylinderInit sCylinderInit = {
@@ -33,10 +33,10 @@ ActorInit Bg_Open_Shutter_InitVars = {
FLAGS,
OBJECT_OPEN_OBJ,
sizeof(BgOpenShutter),
(ActorFunc)BgOpenShutter_Init,
(ActorFunc)BgOpenShutter_Destroy,
(ActorFunc)BgOpenShutter_Update,
(ActorFunc)BgOpenShutter_Draw,
BgOpenShutter_Init,
BgOpenShutter_Destroy,
BgOpenShutter_Update,
BgOpenShutter_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -22,10 +22,10 @@ ActorInit Bg_Open_Spot_InitVars = {
FLAGS,
OBJECT_OPEN_OBJ,
sizeof(BgOpenSpot),
(ActorFunc)BgOpenSpot_Init,
(ActorFunc)BgOpenSpot_Destroy,
(ActorFunc)BgOpenSpot_Update,
(ActorFunc)NULL,
BgOpenSpot_Init,
BgOpenSpot_Destroy,
BgOpenSpot_Update,
NULL,
};
static InitChainEntry sInitChain[] = {
@@ -30,10 +30,10 @@ ActorInit Bg_Sinkai_Kabe_InitVars = {
FLAGS,
OBJECT_SINKAI_KABE,
sizeof(BgSinkaiKabe),
(ActorFunc)BgSinkaiKabe_Init,
(ActorFunc)BgSinkaiKabe_Destroy,
(ActorFunc)BgSinkaiKabe_Update,
(ActorFunc)NULL,
BgSinkaiKabe_Init,
BgSinkaiKabe_Destroy,
BgSinkaiKabe_Update,
NULL,
};
static s32 sCurrentPythonIndex = 0;
@@ -30,10 +30,10 @@ ActorInit Bg_Spdweb_InitVars = {
FLAGS,
OBJECT_SPDWEB,
sizeof(BgSpdweb),
(ActorFunc)BgSpdweb_Init,
(ActorFunc)BgSpdweb_Destroy,
(ActorFunc)BgSpdweb_Update,
(ActorFunc)BgSpdweb_Draw,
BgSpdweb_Init,
BgSpdweb_Destroy,
BgSpdweb_Update,
BgSpdweb_Draw,
};
static ColliderTrisElementInit sTrisElementsInit1[2] = {
@@ -28,10 +28,10 @@ ActorInit Bg_Spout_Fire_InitVars = {
FLAGS,
OBJECT_FWALL,
sizeof(BgSpoutFire),
(ActorFunc)BgSpoutFire_Init,
(ActorFunc)BgSpoutFire_Destroy,
(ActorFunc)BgSpoutFire_Update,
(ActorFunc)NULL,
BgSpoutFire_Init,
BgSpoutFire_Destroy,
BgSpoutFire_Update,
NULL,
};
static ColliderCylinderInit sCylinderInit = {
@@ -22,10 +22,10 @@ ActorInit Bg_Tobira01_InitVars = {
FLAGS,
OBJECT_SPOT11_OBJ,
sizeof(BgTobira01),
(ActorFunc)BgTobira01_Init,
(ActorFunc)BgTobira01_Destroy,
(ActorFunc)BgTobira01_Update,
(ActorFunc)BgTobira01_Draw,
BgTobira01_Init,
BgTobira01_Destroy,
BgTobira01_Update,
BgTobira01_Draw,
};
void BgTobira01_Open(BgTobira01* this, PlayState* play) {
@@ -24,10 +24,10 @@ ActorInit Bg_Umajump_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(BgUmajump),
(ActorFunc)BgUmajump_Init,
(ActorFunc)BgUmajump_Destroy,
(ActorFunc)BgUmajump_Update,
(ActorFunc)NULL,
BgUmajump_Init,
BgUmajump_Destroy,
BgUmajump_Update,
NULL,
};
static InitChainEntry sInitChain[] = {
+4 -4
View File
@@ -240,10 +240,10 @@ ActorInit Boss_01_InitVars = {
FLAGS,
OBJECT_BOSS01,
sizeof(Boss01),
(ActorFunc)Boss01_Init,
(ActorFunc)Boss01_Destroy,
(ActorFunc)Boss01_Update,
(ActorFunc)Boss01_Draw,
Boss01_Init,
Boss01_Destroy,
Boss01_Update,
Boss01_Draw,
};
#endif
+4 -4
View File
@@ -118,10 +118,10 @@ ActorInit Boss_02_InitVars = {
FLAGS,
OBJECT_BOSS02,
sizeof(Boss02),
(ActorFunc)Boss02_Init,
(ActorFunc)Boss02_Destroy,
(ActorFunc)Boss02_Twinmold_Update,
(ActorFunc)Boss02_Twinmold_Draw,
Boss02_Init,
Boss02_Destroy,
Boss02_Twinmold_Update,
Boss02_Twinmold_Draw,
};
f32 D_809DF5B0 = 1.0f;
+4 -4
View File
@@ -280,10 +280,10 @@ ActorInit Boss_03_InitVars = {
FLAGS,
OBJECT_BOSS03,
sizeof(Boss03),
(ActorFunc)Boss03_Init,
(ActorFunc)Boss03_Destroy,
(ActorFunc)Boss03_Update,
(ActorFunc)Boss03_Draw,
Boss03_Init,
Boss03_Destroy,
Boss03_Update,
Boss03_Draw,
};
// The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw
+4 -4
View File
@@ -68,10 +68,10 @@ ActorInit Boss_04_InitVars = {
FLAGS,
OBJECT_BOSS04,
sizeof(Boss04),
(ActorFunc)Boss04_Init,
(ActorFunc)Boss04_Destroy,
(ActorFunc)Boss04_Update,
(ActorFunc)Boss04_Draw,
Boss04_Init,
Boss04_Destroy,
Boss04_Update,
Boss04_Draw,
};
static ColliderJntSphElementInit sJntSphElementsInit1[1] = {
+4 -4
View File
@@ -153,10 +153,10 @@ ActorInit Boss_05_InitVars = {
FLAGS,
OBJECT_BOSS05,
sizeof(Boss05),
(ActorFunc)Boss05_Init,
(ActorFunc)Boss05_Destroy,
(ActorFunc)Boss05_Update,
(ActorFunc)Boss05_Draw,
Boss05_Init,
Boss05_Destroy,
Boss05_Update,
Boss05_Draw,
};
#endif
+4 -4
View File
@@ -75,10 +75,10 @@ ActorInit Boss_06_InitVars = {
FLAGS,
OBJECT_KNIGHT,
sizeof(Boss06),
(ActorFunc)Boss06_Init,
(ActorFunc)Boss06_Destroy,
(ActorFunc)Boss06_Update,
(ActorFunc)Boss06_Draw,
Boss06_Init,
Boss06_Destroy,
Boss06_Update,
Boss06_Draw,
};
static ColliderCylinderInit sCylinderInit = {
+4 -4
View File
@@ -240,10 +240,10 @@ ActorInit Boss_07_InitVars = {
FLAGS,
OBJECT_BOSS07,
sizeof(Boss07),
(ActorFunc)Boss07_Init,
(ActorFunc)Boss07_Destroy,
(ActorFunc)Boss07_Update,
(ActorFunc)Boss07_Draw,
Boss07_Init,
Boss07_Destroy,
Boss07_Update,
Boss07_Draw,
};
// static ColliderJntSphElementInit sJntSphElementsInit[11] = {
@@ -40,10 +40,10 @@ ActorInit Boss_Hakugin_InitVars = {
FLAGS,
OBJECT_BOSS_HAKUGIN,
sizeof(BossHakugin),
(ActorFunc)BossHakugin_Init,
(ActorFunc)BossHakugin_Destroy,
(ActorFunc)BossHakugin_Update,
(ActorFunc)BossHakugin_Draw,
BossHakugin_Init,
BossHakugin_Destroy,
BossHakugin_Update,
BossHakugin_Draw,
};
// static ColliderJntSphElementInit sJntSphElementsInit[19] = {
@@ -31,10 +31,10 @@ ActorInit Demo_Effect_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoEffect),
(ActorFunc)DemoEffect_Init,
(ActorFunc)DemoEffect_Destroy,
(ActorFunc)DemoEffect_Update,
(ActorFunc)NULL,
DemoEffect_Init,
DemoEffect_Destroy,
DemoEffect_Update,
NULL,
};
void DemoEffect_Init(Actor* thisx, PlayState* play) {
@@ -24,10 +24,10 @@ ActorInit Demo_Getitem_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoGetitem),
(ActorFunc)DemoGetitem_Init,
(ActorFunc)DemoGetitem_Destroy,
(ActorFunc)DemoGetitem_Update,
(ActorFunc)NULL,
DemoGetitem_Init,
DemoGetitem_Destroy,
DemoGetitem_Update,
NULL,
};
static s16 sObjectBankIndices[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 };
@@ -28,10 +28,10 @@ ActorInit Demo_Kankyo_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(DemoKankyo),
(ActorFunc)DemoKankyo_Init,
(ActorFunc)DemoKankyo_Destroy,
(ActorFunc)DemoKankyo_Update,
(ActorFunc)DemoKankyo_Draw,
DemoKankyo_Init,
DemoKankyo_Destroy,
DemoKankyo_Update,
DemoKankyo_Draw,
};
static s32 sObjectBubbleIndex = OBJECT_BUBBLE | 0x10000;
@@ -22,10 +22,10 @@ ActorInit Demo_Moonend_InitVars = {
FLAGS,
OBJECT_MOONEND,
sizeof(DemoMoonend),
(ActorFunc)DemoMoonend_Init,
(ActorFunc)DemoMoonend_Destroy,
(ActorFunc)DemoMoonend_Update,
(ActorFunc)DemoMoonend_Draw,
DemoMoonend_Init,
DemoMoonend_Destroy,
DemoMoonend_Update,
DemoMoonend_Draw,
};
#endif
@@ -21,10 +21,10 @@ ActorInit Demo_Shd_InitVars = {
FLAGS,
OBJECT_FWALL,
sizeof(DemoShd),
(ActorFunc)DemoShd_Init,
(ActorFunc)DemoShd_Destroy,
(ActorFunc)DemoShd_Update,
(ActorFunc)DemoShd_Draw,
DemoShd_Init,
DemoShd_Destroy,
DemoShd_Update,
DemoShd_Draw,
};
void DemoShd_Init(Actor* thisx, PlayState* play) {
@@ -31,10 +31,10 @@ ActorInit Demo_Syoten_InitVars = {
FLAGS,
OBJECT_SYOTEN,
sizeof(DemoSyoten),
(ActorFunc)DemoSyoten_Init,
(ActorFunc)DemoSyoten_Destroy,
(ActorFunc)DemoSyoten_Update,
(ActorFunc)DemoSyoten_Draw,
DemoSyoten_Init,
DemoSyoten_Destroy,
DemoSyoten_Update,
DemoSyoten_Draw,
};
u8 D_80C177D0[] = {
@@ -41,10 +41,10 @@ ActorInit Demo_Tre_Lgt_InitVars = {
FLAGS,
OBJECT_BOX,
sizeof(DemoTreLgt),
(ActorFunc)DemoTreLgt_Init,
(ActorFunc)DemoTreLgt_Destroy,
(ActorFunc)DemoTreLgt_Update,
(ActorFunc)DemoTreLgt_Draw,
DemoTreLgt_Init,
DemoTreLgt_Destroy,
DemoTreLgt_Update,
DemoTreLgt_Draw,
};
static TransformUpdateIndex* sBoxLightAnimations[] = {
+4 -4
View File
@@ -21,10 +21,10 @@ ActorInit Dm_Ah_InitVars = {
FLAGS,
OBJECT_AH,
sizeof(DmAh),
(ActorFunc)DmAh_Init,
(ActorFunc)DmAh_Destroy,
(ActorFunc)DmAh_Update,
(ActorFunc)DmAh_Draw,
DmAh_Init,
DmAh_Destroy,
DmAh_Update,
DmAh_Draw,
};
static AnimationInfoS sAnimations[] = {
+4 -4
View File
@@ -21,10 +21,10 @@ ActorInit Dm_Al_InitVars = {
FLAGS,
OBJECT_AL,
sizeof(DmAl),
(ActorFunc)DmAl_Init,
(ActorFunc)DmAl_Destroy,
(ActorFunc)DmAl_Update,
(ActorFunc)DmAl_Draw,
DmAl_Init,
DmAl_Destroy,
DmAl_Update,
DmAl_Draw,
};
typedef enum {
+4 -4
View File
@@ -27,10 +27,10 @@ ActorInit Dm_An_InitVars = {
FLAGS,
OBJECT_AN1,
sizeof(DmAn),
(ActorFunc)DmAn_Init,
(ActorFunc)DmAn_Destroy,
(ActorFunc)DmAn_Update,
(ActorFunc)NULL,
DmAn_Init,
DmAn_Destroy,
DmAn_Update,
NULL,
};
static AnimationInfoS sAnimationInfo[] = {
+4 -4
View File
@@ -24,10 +24,10 @@ ActorInit Dm_Bal_InitVars = {
FLAGS,
OBJECT_BAL,
sizeof(DmBal),
(ActorFunc)DmBal_Init,
(ActorFunc)DmBal_Destroy,
(ActorFunc)DmBal_Update,
(ActorFunc)DmBal_Draw,
DmBal_Init,
DmBal_Destroy,
DmBal_Update,
DmBal_Draw,
};
static AnimationInfo sAnimationInfo[] = {
@@ -26,10 +26,10 @@ ActorInit Dm_Char00_InitVars = {
FLAGS,
OBJECT_DELF,
sizeof(DmChar00),
(ActorFunc)DmChar00_Init,
(ActorFunc)DmChar00_Destroy,
(ActorFunc)DmChar00_Update,
(ActorFunc)DmChar00_Draw,
DmChar00_Init,
DmChar00_Destroy,
DmChar00_Update,
DmChar00_Draw,
};
static AnimationInfo sAnimationInfo[] = {
@@ -41,10 +41,10 @@ ActorInit Dm_Char01_InitVars = {
FLAGS,
OBJECT_MTORIDE,
sizeof(DmChar01),
(ActorFunc)DmChar01_Init,
(ActorFunc)DmChar01_Destroy,
(ActorFunc)DmChar01_Update,
(ActorFunc)DmChar01_Draw,
DmChar01_Init,
DmChar01_Destroy,
DmChar01_Update,
DmChar01_Draw,
};
static InitChainEntry sInitChain[] = {
@@ -24,10 +24,10 @@ ActorInit Dm_Char02_InitVars = {
FLAGS,
OBJECT_STK2,
sizeof(DmChar02),
(ActorFunc)DmChar02_Init,
(ActorFunc)DmChar02_Destroy,
(ActorFunc)DmChar02_Update,
(ActorFunc)DmChar02_Draw,
DmChar02_Init,
DmChar02_Destroy,
DmChar02_Update,
DmChar02_Draw,
};
@@ -26,10 +26,10 @@ ActorInit Dm_Char03_InitVars = {
FLAGS,
OBJECT_OSN,
sizeof(DmChar03),
(ActorFunc)DmChar03_Init,
(ActorFunc)DmChar03_Destroy,
(ActorFunc)DmChar03_Update,
(ActorFunc)DmChar03_Draw,
DmChar03_Init,
DmChar03_Destroy,
DmChar03_Update,
DmChar03_Draw,
};
AnimationInfo sAnimationInfo[] = {
@@ -24,10 +24,10 @@ ActorInit Dm_Char04_InitVars = {
FLAGS,
GAMEPLAY_KEEP,
sizeof(DmChar04),
(ActorFunc)DmChar04_Init,
(ActorFunc)DmChar04_Destroy,
(ActorFunc)DmChar04_Update,
(ActorFunc)DmChar04_Draw,
DmChar04_Init,
DmChar04_Destroy,
DmChar04_Update,
DmChar04_Draw,
};
void DmChar04_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animation, u16 animIndex) {
@@ -41,10 +41,10 @@ ActorInit Dm_Char05_InitVars = {
FLAGS,
OBJECT_DMASK,
sizeof(DmChar05),
(ActorFunc)DmChar05_Init,
(ActorFunc)DmChar05_Destroy,
(ActorFunc)DmChar05_Update,
(ActorFunc)DmChar05_Draw,
DmChar05_Init,
DmChar05_Destroy,
DmChar05_Update,
DmChar05_Draw,
};
static AnimationInfo sAnimationInfo[] = {
@@ -24,10 +24,10 @@ ActorInit Dm_Char06_InitVars = {
FLAGS,
OBJECT_YUKIYAMA,
sizeof(DmChar06),
(ActorFunc)DmChar06_Init,
(ActorFunc)DmChar06_Destroy,
(ActorFunc)DmChar06_Update,
(ActorFunc)DmChar06_Draw,
DmChar06_Init,
DmChar06_Destroy,
DmChar06_Update,
DmChar06_Draw,
};
void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc) {
@@ -24,10 +24,10 @@ ActorInit Dm_Char07_InitVars = {
FLAGS,
OBJECT_MILKBAR,
sizeof(DmChar07),
(ActorFunc)DmChar07_Init,
(ActorFunc)DmChar07_Destroy,
(ActorFunc)DmChar07_Update,
(ActorFunc)DmChar07_Draw,
DmChar07_Init,
DmChar07_Destroy,
DmChar07_Update,
DmChar07_Draw,
};
void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) {

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