izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove (ActorFunc) cast on InitVars (#1148)

Browse Source 
* Remove ActorFunc cast

* Format

* Revert "Format"

This reverts commit a6e89b39692c22cfae26c8aa3a8fe288ccd61c32.

* Messing with formatting

* format header a bit

* Revert "Messing with formatting"

This reverts commit c8db520278d7730a83e3fbc460ebe87929c16928.

* 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 {

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