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

Remove THIS macro (#1047)

Browse source 
* remove THIS

* fix

* forgot dorf
This commit is contained in:
fig02 2021-12-04 11:33:00 -05:00 • committed by GitHub
parent 68899c2e33
commit e635e34265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
433 changed files with 1996 additions and 2859 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/code/z_en_a_keep.c
View file

@ -4,8 +4,6 @@
#define FLAGS 0x00000010
#define THIS ((EnAObj*)thisx)
void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx);
void EnAObj_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx);
@ -87,7 +85,7 @@ void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) {
void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
CollisionHeader* colHeader = NULL;
s32 pad;
EnAObj* this = THIS;
EnAObj* this = (EnAObj*)thisx;
f32 shadowScale = 6.0f;
this->textId = (thisx->params >> 8) & 0xFF;
@ -186,7 +184,7 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnAObj_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnAObj* this = THIS;
EnAObj* this = (EnAObj*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -320,7 +318,7 @@ void EnAObj_Block(EnAObj* this, GlobalContext* globalCtx) {
}
void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx) {
EnAObj* this = THIS;
EnAObj* this = (EnAObj*)thisx;
this->actionFunc(this, globalCtx);
Actor_MoveForward(&this->dyna.actor);

10
src/code/z_en_item00.c
View file

@ -5,8 +5,6 @@
#define FLAGS 0x00000000
#define THIS ((EnItem00*)thisx)
void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx);
void EnItem00_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx);
@ -331,7 +329,7 @@ void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) {
}
void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
EnItem00* this = (EnItem00*)thisx;
s32 pad;
f32 yOffset = 980.0f;
f32 shadowScale = 6.0f;
@ -553,7 +551,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnItem00_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
EnItem00* this = (EnItem00*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -729,7 +727,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
s16 sp3A = 0;
s16 i;
u32* temp;
EnItem00* this = THIS;
EnItem00* this = (EnItem00*)thisx;
s32 pad;
if (this->unk_15A > 0) {
@ -933,7 +931,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
EnItem00* this = (EnItem00*)thisx;
f32 mtxScale;
if (!(this->unk_156 & this->unk_158)) {

18
src/code/z_fbdemo_circle.c
View file

@ -34,10 +34,8 @@ Gfx sCircleDList[] = {
gsSPEndDisplayList(),
};
#define THIS ((TransitionCircle*)thisx)
void TransitionCircle_Start(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->isDone = 0;
@ -92,7 +90,7 @@ void TransitionCircle_Start(void* thisx) {
}
void* TransitionCircle_Init(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
bzero(this, sizeof(*this));
return this;
@ -102,7 +100,7 @@ void TransitionCircle_Destroy(void* thisx) {
}
void TransitionCircle_Update(void* thisx, s32 updateRate) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
s32 temp_t2;
s32 temp_t3;
@ -136,7 +134,7 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) {
void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx = *gfxP;
Mtx* modelView;
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
Gfx* texScroll;
// These variables are a best guess based on the other transition types.
f32 tPos = 0.0f;
@ -176,13 +174,13 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
}
s32 TransitionCircle_IsDone(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
return this->isDone;
}
void TransitionCircle_SetType(void* thisx, s32 type) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
if (type & 0x80) {
this->unk_14 = (type >> 5) & 0x1;
@ -197,13 +195,13 @@ void TransitionCircle_SetType(void* thisx, s32 type) {
}
void TransitionCircle_SetColor(void* thisx, u32 color) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->color.rgba = color;
}
void TransitionCircle_SetEnvColor(void* thisx, u32 envColor) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->envColor.rgba = envColor;
}

16
src/code/z_fbdemo_fade.c
View file

@ -12,10 +12,8 @@ static Gfx sRCPSetupFade[] = {
gsSPEndDisplayList(),
};
#define THIS ((TransitionFade*)thisx)
void TransitionFade_Start(void* thisx) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
switch (this->fadeType) {
case 0:
@ -32,7 +30,7 @@ void TransitionFade_Start(void* thisx) {
}
void* TransitionFade_Init(void* thisx) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
bzero(this, sizeof(*this));
return this;
@ -44,7 +42,7 @@ void TransitionFade_Destroy(void* thisx) {
void TransitionFade_Update(void* thisx, s32 updateRate) {
s32 alpha;
s16 newAlpha;
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
switch (this->fadeType) {
case 0:
@ -84,7 +82,7 @@ void TransitionFade_Update(void* thisx, s32 updateRate) {
}
void TransitionFade_Draw(void* thisx, Gfx** gfxP) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
Gfx* gfx;
Color_RGBA8_u32* color = &this->fadeColor;
@ -99,19 +97,19 @@ void TransitionFade_Draw(void* thisx, Gfx** gfxP) {
}
s32 TransitionFade_IsDone(void* thisx) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
return this->isDone;
}
void TransitionFade_SetColor(void* thisx, u32 color) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
this->fadeColor.rgba = color;
}
void TransitionFade_SetType(void* thisx, s32 type) {
TransitionFade* this = THIS;
TransitionFade* this = (TransitionFade*)thisx;
if (type == 1) {
this->fadeType = 1;

18
src/code/z_fbdemo_triforce.c
View file

@ -2,10 +2,8 @@
#include "code/fbdemo_triforce/z_fbdemo_triforce.c"
#define THIS ((TransitionTriforce*)thisx)
void TransitionTriforce_Start(void* thisx) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
switch (this->state) {
case 1:
@ -17,7 +15,7 @@ void TransitionTriforce_Start(void* thisx) {
}
void* TransitionTriforce_Init(void* thisx) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
bzero(this, sizeof(*this));
guOrtho(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f);
@ -32,7 +30,7 @@ void TransitionTriforce_Destroy(void* thisx) {
}
void TransitionTriforce_Update(void* thisx, s32 updateRate) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
f32 temp_f0;
s32 i;
@ -50,20 +48,20 @@ void TransitionTriforce_Update(void* thisx, s32 updateRate) {
}
void TransitionTriforce_SetColor(void* thisx, u32 color) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
this->color.rgba = color;
}
void TransitionTriforce_SetType(void* thisx, s32 type) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
this->fadeDirection = type;
}
// unused
void TransitionTriforce_SetState(void* thisx, s32 state) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
this->state = state;
}
@ -72,7 +70,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx = *gfxP;
Mtx* modelView;
f32 scale;
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
s32 pad;
f32 rotation = this->transPos * 360.0f;
@ -119,7 +117,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) {
}
s32 TransitionTriforce_IsDone(void* thisx) {
TransitionTriforce* this = THIS;
TransitionTriforce* this = (TransitionTriforce*)thisx;
s32 ret = 0;

18
src/code/z_fbdemo_wipe1.c
View file

@ -36,10 +36,8 @@ Gfx sWipeSyncDList[] = {
gsSPEndDisplayList(),
};
#define THIS ((TransitionWipe*)thisx)
void TransitionWipe_Start(void* thisx) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
this->isDone = 0;
@ -54,7 +52,7 @@ void TransitionWipe_Start(void* thisx) {
}
void* TransitionWipe_Init(void* thisx) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
bzero(this, sizeof(*this));
return this;
@ -64,7 +62,7 @@ void TransitionWipe_Destroy(void* thisx) {
}
void TransitionWipe_Update(void* thisx, s32 updateRate) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
u8 unk1419;
if (this->direction != 0) {
@ -87,7 +85,7 @@ void TransitionWipe_Update(void* thisx, s32 updateRate) {
void TransitionWipe_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx = *gfxP;
Mtx* modelView;
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
s32 pad[4];
Gfx* tex;
@ -113,13 +111,13 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) {
}
s32 TransitionWipe_IsDone(void* thisx) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
return this->isDone;
}
void TransitionWipe_SetType(void* thisx, s32 type) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
if (type == 1) {
this->direction = 1;
@ -135,13 +133,13 @@ void TransitionWipe_SetType(void* thisx, s32 type) {
}
void TransitionWipe_SetColor(void* thisx, u32 color) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
this->color.rgba = color;
}
void TransitionWipe_SetEnvColor(void* thisx, u32 color) {
TransitionWipe* this = THIS;
TransitionWipe* this = (TransitionWipe*)thisx;
this->envColor.rgba = color;
}

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

@ -2,8 +2,6 @@
#define FLAGS 0x00000030
#define THIS ((ArmsHook*)thisx)
void ArmsHook_Init(Actor* thisx, GlobalContext* globalCtx);
void ArmsHook_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ArmsHook_Update(Actor* thisx, GlobalContext* globalCtx);
@ -67,7 +65,7 @@ void ArmsHook_SetupAction(ArmsHook* this, ArmsHookActionFunc actionFunc) {
}
void ArmsHook_Init(Actor* thisx, GlobalContext* globalCtx) {
ArmsHook* this = THIS;
ArmsHook* this = (ArmsHook*)thisx;
Collider_InitQuad(globalCtx, &this->collider);
Collider_SetQuad(globalCtx, &this->collider, &this->actor, &sQuadInit);
@ -76,7 +74,7 @@ void ArmsHook_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ArmsHook_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ArmsHook* this = THIS;
ArmsHook* this = (ArmsHook*)thisx;
if (this->grabbed != NULL) {
this->grabbed->flags &= ~0x2000;
@ -292,7 +290,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) {
}
void ArmsHook_Update(Actor* thisx, GlobalContext* globalCtx) {
ArmsHook* this = THIS;
ArmsHook* this = (ArmsHook*)thisx;
this->actionFunc(this, globalCtx);
this->unk_1F4 = this->unk_1E8;
@ -300,7 +298,7 @@ void ArmsHook_Update(Actor* thisx, GlobalContext* globalCtx) {
void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ArmsHook* this = THIS;
ArmsHook* this = (ArmsHook*)thisx;
Player* player = GET_PLAYER(globalCtx);
Vec3f sp78;
Vec3f sp6C;

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

@ -9,8 +9,6 @@
#define FLAGS 0x02000010
#define THIS ((ArrowFire*)thisx)
void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx);
void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx);
@ -43,7 +41,7 @@ void ArrowFire_SetupAction(ArrowFire* this, ArrowFireActionFunc actionFunc) {
}
void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
ArrowFire* this = (ArrowFire*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->radius = 0;
@ -180,7 +178,7 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) {
}
void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
ArrowFire* this = (ArrowFire*)thisx;
if (globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
globalCtx->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
@ -191,7 +189,7 @@ void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
ArrowFire* this = THIS;
ArrowFire* this = (ArrowFire*)thisx;
GlobalContext* globalCtx = globalCtx2;
u32 stateFrames;
EnArrow* arrow;

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

@ -10,8 +10,6 @@
#define FLAGS 0x02000010
#define THIS ((ArrowIce*)thisx)
void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx);
void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx);
@ -44,7 +42,7 @@ void ArrowIce_SetupAction(ArrowIce* this, ArrowIceActionFunc actionFunc) {
}
void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
ArrowIce* this = (ArrowIce*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->radius = 0;
@ -181,7 +179,7 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) {
}
void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
ArrowIce* this = (ArrowIce*)thisx;
if (globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
globalCtx->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
@ -192,7 +190,7 @@ void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
ArrowIce* this = (ArrowIce*)thisx;
s32 pad;
Actor* tranform;
u32 stateFrames = globalCtx->state.frames;

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

@ -10,8 +10,6 @@
#define FLAGS 0x02000010
#define THIS ((ArrowLight*)thisx)
void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx);
@ -44,7 +42,7 @@ void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) {
}
void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
ArrowLight* this = (ArrowLight*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->radius = 0;
@ -179,7 +177,7 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) {
}
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
ArrowLight* this = (ArrowLight*)thisx;
if (globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
globalCtx->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
@ -190,7 +188,7 @@ void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
ArrowLight* this = (ArrowLight*)thisx;
s32 pad;
u32 stateFrames = globalCtx->state.frames;
EnArrow* arrow = (EnArrow*)this->actor.parent;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgBdanObjects*)thisx)
void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBdanObjects_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBdanObjects_Update(Actor* thisx, GlobalContext* globalCtx);
@ -108,7 +106,7 @@ void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) {
void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgBdanObjects* this = THIS;
BgBdanObjects* this = (BgBdanObjects*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -165,7 +163,7 @@ void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBdanObjects_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
BgBdanObjects* this = (BgBdanObjects*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
if (thisx->params == 0) {
@ -439,14 +437,14 @@ void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) {
}
void BgBdanObjects_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
BgBdanObjects* this = (BgBdanObjects*)thisx;
Actor_SetFocus(thisx, 50.0f);
this->actionFunc(this, globalCtx);
}
void BgBdanObjects_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
BgBdanObjects* this = (BgBdanObjects*)thisx;
if (thisx->params == 0) {
if (this->actionFunc == func_8086C054) {

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgBdanSwitch*)thisx)
void BgBdanSwitch_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBdanSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBdanSwitch_Update(Actor* thisx, GlobalContext* globalCtx);
@ -136,7 +134,7 @@ void func_8086D0EC(BgBdanSwitch* this) {
}
void BgBdanSwitch_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
BgBdanSwitch* this = (BgBdanSwitch*)thisx;
s32 pad;
s16 type;
s32 flag;
@ -203,7 +201,7 @@ void BgBdanSwitch_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBdanSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
BgBdanSwitch* this = (BgBdanSwitch*)thisx;
switch (this->dyna.actor.params & 0xFF) {
case BLUE:
@ -484,7 +482,7 @@ void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) {
void BgBdanSwitch_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgBdanSwitch* this = THIS;
BgBdanSwitch* this = (BgBdanSwitch*)thisx;
s32 type;
if (this->unk_1DA > 0) {
@ -516,7 +514,7 @@ void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, Gfx* dlist) {
}
void BgBdanSwitch_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
BgBdanSwitch* this = (BgBdanSwitch*)thisx;
switch (this->dyna.actor.params & 0xFF) {
case YELLOW_HEAVY:

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

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((BgBomGuard*)thisx)
void BgBomGuard_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBomGuard_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBomGuard_Update(Actor* thisx, GlobalContext* globalCtx);
@ -36,7 +34,7 @@ void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) {
}
void BgBomGuard_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
BgBomGuard* this = (BgBomGuard*)thisx;
s32 pad[2];
CollisionHeader* colHeader = NULL;
@ -55,7 +53,7 @@ void BgBomGuard_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBomGuard_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
BgBomGuard* this = (BgBomGuard*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -85,7 +83,7 @@ void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) {
}
void BgBomGuard_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
BgBomGuard* this = (BgBomGuard*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00400000
#define THIS ((BgBombwall*)thisx)
void BgBombwall_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBombwall_Update(Actor* thisx, GlobalContext* globalCtx);
@ -117,7 +115,7 @@ void BgBombwall_Init(Actor* thisx, GlobalContext* globalCtx) {
Vec3f vecs[3];
Vec3f sp80;
s32 pad;
BgBombwall* this = THIS;
BgBombwall* this = (BgBombwall*)thisx;
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
f32 cos = Math_CosS(this->dyna.actor.shape.rot.y);
@ -168,7 +166,7 @@ void BgBombwall_DestroyCollision(BgBombwall* this, GlobalContext* globalCtx) {
}
void BgBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBombwall* this = THIS;
BgBombwall* this = (BgBombwall*)thisx;
BgBombwall_DestroyCollision(this, globalCtx);
}
@ -247,7 +245,7 @@ void func_8086EE94(BgBombwall* this, GlobalContext* globalCtx) {
}
void BgBombwall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBombwall* this = THIS;
BgBombwall* this = (BgBombwall*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);
@ -255,7 +253,7 @@ void BgBombwall_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBombwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBombwall* this = THIS;
BgBombwall* this = (BgBombwall*)thisx;
Gfx_DrawDListOpa(globalCtx, this->dList);
}

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

@ -12,8 +12,6 @@
#define FLAGS 0x00000030
#define THIS ((BgBowlWall*)thisx)
void BgBowlWall_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBowlWall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBowlWall_Update(Actor* thisx, GlobalContext* globalCtx);
@ -47,7 +45,7 @@ static Vec3f sBullseyeOffset[] = {
static s16 sTargetRot[] = { 0x0000, 0x0000, 0x3FFF, -0x3FFF };
void BgBowlWall_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBowlWall* this = THIS;
BgBowlWall* this = (BgBowlWall*)thisx;
s32 pad1;
s32 pad2;
CollisionHeader* colHeader = NULL;
@ -69,7 +67,7 @@ void BgBowlWall_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBowlWall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBowlWall* this = THIS;
BgBowlWall* this = (BgBowlWall*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -189,7 +187,7 @@ void BgBowlWall_Reset(BgBowlWall* this, GlobalContext* globalCtx) {
}
void BgBowlWall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBowlWall* this = THIS;
BgBowlWall* this = (BgBowlWall*)thisx;
if (this->timer != 0) {
this->timer--;
@ -200,7 +198,7 @@ void BgBowlWall_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgBowlWall* this = THIS;
BgBowlWall* this = (BgBowlWall*)thisx;
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_bowl_wall.c", 441);

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

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((BgBreakwall*)thisx)
typedef struct {
/* 0x00 */ CollisionHeader* colHeader;
/* 0x04 */ Gfx* dList;
@ -79,7 +77,7 @@ void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc
}
void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
s32 pad;
s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF;
@ -116,7 +114,7 @@ void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBreakwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -276,7 +274,7 @@ void BgBreakwall_LavaCoverMove(BgBreakwall* this, GlobalContext* globalCtx) {
}
void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
this->actionFunc(this, globalCtx);
}
@ -292,7 +290,7 @@ static Vec3f sColQuadList[][4] = {
void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
if (this->bombableWallDList != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_breakwall.c", 767);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgDdanJd*)thisx)
void BgDdanJd_Init(Actor* thisx, GlobalContext* globalCtx);
void BgDdanJd_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgDdanJd_Update(Actor* thisx, GlobalContext* globalCtx);
@ -54,7 +52,7 @@ typedef enum {
void BgDdanJd_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgDdanJd* this = THIS;
BgDdanJd* this = (BgDdanJd*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -76,7 +74,7 @@ void BgDdanJd_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgDdanJd_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgDdanJd* this = THIS;
BgDdanJd* this = (BgDdanJd*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -171,7 +169,7 @@ void BgDdanJd_Move(BgDdanJd* this, GlobalContext* globalCtx) {
}
void BgDdanJd_Update(Actor* thisx, GlobalContext* globalCtx) {
BgDdanJd* this = THIS;
BgDdanJd* this = (BgDdanJd*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgDdanKd*)thisx)
void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx);
void BgDdanKd_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgDdanKd_Update(Actor* thisx, GlobalContext* globalCtx);
@ -64,7 +62,7 @@ void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) {
}
void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
BgDdanKd* this = (BgDdanKd*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -87,7 +85,7 @@ void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgDdanKd_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
BgDdanKd* this = (BgDdanKd*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -179,7 +177,7 @@ void func_80871838(BgDdanKd* this, GlobalContext* globalCtx) {
}
void BgDdanKd_Update(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
BgDdanKd* this = (BgDdanKd*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgDodoago*)thisx)
void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx);
void BgDodoago_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx);
@ -108,7 +106,7 @@ static u8 D_808727C0[100];
static s32 D_80872824;
void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) {
BgDodoago* this = THIS;
BgDodoago* this = (BgDodoago*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -136,7 +134,7 @@ void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgDodoago_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgDodoago* this = THIS;
BgDodoago* this = (BgDodoago*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->colliders[0]);
@ -258,7 +256,7 @@ void func_80872288(BgDodoago* this, GlobalContext* globalCtx) {
}
void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) {
BgDodoago* this = THIS;
BgDodoago* this = (BgDodoago*)thisx;
EnBom* bomb;
if (this->dyna.actor.parent == NULL) {

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

@ -13,8 +13,6 @@
#define FLAGS 0x02000030
#define THIS ((BgDyYoseizo*)thisx)
typedef enum {
/* 0 */ FAIRY_UPGRADE_MAGIC,
/* 1 */ FAIRY_UPGRADE_DOUBLE_MAGIC,
@ -70,7 +68,7 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = {
void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgDyYoseizo* this = THIS;
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
this->fountainType = globalCtx->curSpawn;
@ -804,7 +802,7 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) {
void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgDyYoseizo* this = THIS;
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
s32 phi_v1;
this->absoluteTimer++;
@ -869,7 +867,7 @@ void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx2) {
s32 BgDyYoseizo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
void* thisx) {
BgDyYoseizo* this = THIS;
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
if (limbIndex == 8) { // Torso
rot->x += this->torsoRot.y;
@ -893,7 +891,7 @@ static void* sMouthTextures[] = {
};
void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgDyYoseizo* this = THIS;
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_dy_yoseizo.c", 1609);
if (this->actionFunc != BgDyYoseizo_Vanish) {

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000030
#define THIS ((BgGanonOtyuka*)thisx)
typedef enum {
/* 0x00 */ FLASH_NONE,
/* 0x01 */ FLASH_GROW,
@ -68,7 +66,7 @@ static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI };
#include "overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c"
void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx2) {
BgGanonOtyuka* this = THIS;
BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;
GlobalContext* globalCtx = globalCtx2;
CollisionHeader* colHeader = NULL;
@ -86,7 +84,7 @@ void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx2) {
}
void BgGanonOtyuka_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
BgGanonOtyuka* this = THIS;
BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;
GlobalContext* globalCtx = globalCtx2;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -236,7 +234,7 @@ void BgGanonOtyuka_DoNothing(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGanonOtyuka_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGanonOtyuka* this = THIS;
BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;
this->actionFunc(this, globalCtx);
this->flashTimer++;
@ -246,7 +244,7 @@ void BgGanonOtyuka_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGanonOtyuka* this = THIS;
BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;
s16 i;
Gfx* phi_s2;
Gfx* phi_s1;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgGateShutter*)thisx)
void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGateShutter_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx);
@ -35,7 +33,7 @@ const ActorInit Bg_Gate_Shutter_InitVars = {
};
void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
BgGateShutter* this = (BgGateShutter*)thisx;
s32 pad[2];
CollisionHeader* colHeader = NULL;
@ -59,7 +57,7 @@ void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGateShutter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
BgGateShutter* this = (BgGateShutter*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -116,7 +114,7 @@ void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) {
}
void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
BgGateShutter* this = (BgGateShutter*)thisx;
if (this->unk_178 != 0) {
this->unk_178 -= 1;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgGjyoBridge*)thisx)
void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGjyoBridge_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx);
@ -39,7 +37,7 @@ static InitChainEntry sInitChain[] = {
};
void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
s32 pad;
CollisionHeader* colHeader;
@ -61,7 +59,7 @@ void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGjyoBridge_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -93,13 +91,13 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx) {
}
void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
this->actionFunc(this, globalCtx);
}
void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgGndDarkmeiro*)thisx)
void BgGndDarkmeiro_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGndDarkmeiro_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGndDarkmeiro_Update(Actor* thisx, GlobalContext* globalCtx);
@ -50,7 +48,7 @@ void BgGndDarkmeiro_ToggleBlock(BgGndDarkmeiro* this, GlobalContext* globalCtx)
void BgGndDarkmeiro_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
CollisionHeader* colHeader = NULL;
BgGndDarkmeiro* this = THIS;
BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx;
this->updateFunc = BgGndDarkmeiro_Noop;
Actor_SetScale(&this->dyna.actor, 0.1f);
@ -100,7 +98,7 @@ void BgGndDarkmeiro_Init(Actor* thisx, GlobalContext* globalCtx2) {
void BgGndDarkmeiro_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgGndDarkmeiro* this = THIS;
BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx;
if ((this->dyna.actor.params & 0xFF) == 1) {
if (1) {}
@ -171,7 +169,7 @@ void BgGndDarkmeiro_UpdateSwitchBlock(BgGndDarkmeiro* this, GlobalContext* globa
}
void BgGndDarkmeiro_Update(Actor* thisx, GlobalContext* globalCtx2) {
BgGndDarkmeiro* this = THIS;
BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx;
GlobalContext* globalCtx = globalCtx2;
this->updateFunc(this, globalCtx2);
@ -182,7 +180,7 @@ void BgGndDarkmeiro_DrawInvisiblePath(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) {
BgGndDarkmeiro* this = THIS;
BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx;
s16 vanishTimer;
vanishTimer = this->timer1;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgGndFiremeiro*)thisx)
void BgGndFiremeiro_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGndFiremeiro_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGndFiremeiro_Update(Actor* thisx, GlobalContext* globalCtx);
@ -34,7 +32,7 @@ const ActorInit Bg_Gnd_Firemeiro_InitVars = {
void BgGndFiremeiro_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndFiremeiro* this = THIS;
BgGndFiremeiro* this = (BgGndFiremeiro*)thisx;
CollisionHeader* colHeader = NULL;
ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f);
@ -51,7 +49,7 @@ void BgGndFiremeiro_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgGndFiremeiro_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgGndFiremeiro* this = THIS;
BgGndFiremeiro* this = (BgGndFiremeiro*)thisx;
if (this->dyna.actor.params == 0) {
if (1) {}
@ -135,7 +133,7 @@ void BgGndFiremeiro_Rise(BgGndFiremeiro* this, GlobalContext* globalCtx) {
}
void BgGndFiremeiro_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGndFiremeiro* this = THIS;
BgGndFiremeiro* this = (BgGndFiremeiro*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgGndIceblock*)thisx)
typedef enum {
/* 0 */ GNDICE_IDLE,
/* 1 */ GNDICE_FALL,
@ -48,7 +46,7 @@ static u8 sBlockPositions[2];
void BgGndIceblock_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndIceblock* this = THIS;
BgGndIceblock* this = (BgGndIceblock*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -71,7 +69,7 @@ void BgGndIceblock_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgGndIceblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndIceblock* this = THIS;
BgGndIceblock* this = (BgGndIceblock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -347,14 +345,14 @@ void BgGndIceblock_Slide(BgGndIceblock* this, GlobalContext* globalCtx) {
void BgGndIceblock_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndIceblock* this = THIS;
BgGndIceblock* this = (BgGndIceblock*)thisx;
this->actionFunc(this, globalCtx);
}
void BgGndIceblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndIceblock* this = THIS;
BgGndIceblock* this = (BgGndIceblock*)thisx;
Gfx_DrawDListOpa(globalCtx, gWaterTrialIceBlockDL);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgGndNisekabe*)thisx)
void BgGndNisekabe_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGndNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGndNisekabe_Update(Actor* thisx, GlobalContext* globalCtx);
@ -29,7 +27,7 @@ const ActorInit Bg_Gnd_Nisekabe_InitVars = {
};
void BgGndNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
BgGndNisekabe* this = (BgGndNisekabe*)thisx;
Actor_SetScale(&this->actor, 0.1);
this->actor.uncullZoneForward = 3000.0;
@ -39,7 +37,7 @@ void BgGndNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndNisekabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
BgGndNisekabe* this = (BgGndNisekabe*)thisx;
if (globalCtx->actorCtx.unk_03 != 0) {
this->actor.flags |= 0x80;
@ -54,7 +52,7 @@ void BgGndNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gGanonsCastleUnusedFakeWallDL,
gGanonsCastleScrubsFakeWallDL,
};
BgGndNisekabe* this = THIS;
BgGndNisekabe* this = (BgGndNisekabe*)thisx;
u32 index = this->actor.params & 0xFF;
if ((this->actor.flags & 0x80) == 0x80) {

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgGndSoulmeiro*)thisx)
void BgGndSoulmeiro_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGndSoulmeiro_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGndSoulmeiro_Update(Actor* thisx, GlobalContext* globalCtx);
@ -62,7 +60,7 @@ static InitChainEntry sInitChain[] = {
void BgGndSoulmeiro_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgGndSoulmeiro* this = THIS;
BgGndSoulmeiro* this = (BgGndSoulmeiro*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->actionFunc = NULL;
@ -96,7 +94,7 @@ void BgGndSoulmeiro_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndSoulmeiro_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgGndSoulmeiro* this = THIS;
BgGndSoulmeiro* this = (BgGndSoulmeiro*)thisx;
if ((this->actor.params & 0xFF) == 0) {
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -183,7 +181,7 @@ void func_8087B350(BgGndSoulmeiro* this, GlobalContext* globalCtx) {
}
void BgGndSoulmeiro_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGndSoulmeiro* this = THIS;
BgGndSoulmeiro* this = (BgGndSoulmeiro*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHaka*)thisx)
void BgHaka_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHaka_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHaka_Update(Actor* thisx, GlobalContext* globalCtx);
@ -40,7 +38,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHaka_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHaka* this = THIS;
BgHaka* this = (BgHaka*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -52,7 +50,7 @@ void BgHaka_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHaka_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHaka* this = THIS;
BgHaka* this = (BgHaka*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -143,7 +141,7 @@ void func_8087BAE4(BgHaka* this, GlobalContext* globalCtx) {
}
void BgHaka_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHaka* this = THIS;
BgHaka* this = (BgHaka*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHakaGate*)thisx)
// general purpose timer
#define vTimer actionVar1
@ -72,7 +70,7 @@ static InitChainEntry sInitChain[] = {
void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHakaGate* this = THIS;
BgHakaGate* this = (BgHakaGate*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(thisx, sInitChain);
@ -137,7 +135,7 @@ void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgHakaGate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHakaGate* this = THIS;
BgHakaGate* this = (BgHakaGate*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
if (this->dyna.actor.params == BGHAKAGATE_STATUE) {
@ -302,7 +300,7 @@ void BgHakaGate_FalseSkull(BgHakaGate* this, GlobalContext* globalCtx) {
void BgHakaGate_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHakaGate* this = THIS;
BgHakaGate* this = (BgHakaGate*)thisx;
this->actionFunc(this, globalCtx);
if (this->dyna.actor.params == BGHAKAGATE_SKULL) {
@ -344,7 +342,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
object_haka_objects_DL_00A860,
object_haka_objects_DL_00F1B0,
};
BgHakaGate* this = THIS;
BgHakaGate* this = (BgHakaGate*)thisx;
MtxF currentMtxF;
if ((thisx->flags & 0x80) == 0x80) {

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHakaHuta*)thisx)
void BgHakaHuta_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaHuta_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaHuta_Update(Actor* thisx, GlobalContext* globalCtx);
@ -41,7 +39,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHakaHuta_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaHuta* this = THIS;
BgHakaHuta* this = (BgHakaHuta*)thisx;
s16 pad;
CollisionHeader* colHeader = NULL;
@ -60,7 +58,7 @@ void BgHakaHuta_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaHuta_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaHuta* this = THIS;
BgHakaHuta* this = (BgHakaHuta*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -207,7 +205,7 @@ void BgHakaHuta_DoNothing(BgHakaHuta* this, GlobalContext* globalCtx) {
}
void BgHakaHuta_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaHuta* this = THIS;
BgHakaHuta* this = (BgHakaHuta*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -10,8 +10,6 @@
#define FLAGS 0x000000B0
#define THIS ((BgHakaMegane*)thisx)
void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaMegane_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaMegane_Update(Actor* thisx, GlobalContext* globalCtx);
@ -62,7 +60,7 @@ static Gfx* sDLists[] = {
};
void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
BgHakaMegane* this = (BgHakaMegane*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
DynaPolyActor_Init(&this->dyna, DPM_UNK);
@ -81,7 +79,7 @@ void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaMegane_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
BgHakaMegane* this = (BgHakaMegane*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -123,13 +121,13 @@ void BgHakaMegane_DoNothing(BgHakaMegane* this, GlobalContext* globalCtx) {
}
void BgHakaMegane_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
BgHakaMegane* this = (BgHakaMegane*)thisx;
this->actionFunc(this, globalCtx);
}
void BgHakaMegane_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
BgHakaMegane* this = (BgHakaMegane*)thisx;
if ((thisx->flags & 0x80) == 0x80) {
Gfx_DrawDListXlu(globalCtx, sDLists[thisx->params]);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHakaMeganeBG*)thisx)
void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaMeganeBG_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaMeganeBG_Update(Actor* thisx, GlobalContext* globalCtx);
@ -57,7 +55,7 @@ static Gfx* D_8087E410[] = {
void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHakaMeganeBG* this = THIS;
BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -101,7 +99,7 @@ void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaMeganeBG_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMeganeBG* this = THIS;
BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -205,13 +203,13 @@ void func_8087E34C(BgHakaMeganeBG* this, GlobalContext* globalCtx) {
}
void BgHakaMeganeBG_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMeganeBG* this = THIS;
BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx;
this->actionFunc(this, globalCtx);
}
void BgHakaMeganeBG_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMeganeBG* this = THIS;
BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx;
s16 params = this->dyna.actor.params;
if (params == 0) {

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000011
#define THIS ((BgHakaSgami*)thisx)
typedef enum {
/* 0 */ SCYTHE_TRAP_SHADOW_TEMPLE,
/* 1 */ SCYTHE_TRAP_SHADOW_TEMPLE_INVISIBLE,
@ -133,7 +131,7 @@ void BgHakaSgami_Init(Actor* thisx, GlobalContext* globalCtx) {
static u8 sP2StartColor[] = { 200, 200, 200, 130 };
static u8 sP1EndColor[] = { 200, 200, 200, 60 };
static u8 sP2EndColor[] = { 150, 150, 150, 20 };
BgHakaSgami* this = THIS;
BgHakaSgami* this = (BgHakaSgami*)thisx;
EffectBlureInit1 blureInit;
s32 i;
ColliderTris* colliderScythe = &this->colliderScythe;
@ -189,7 +187,7 @@ void BgHakaSgami_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaSgami_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaSgami* this = THIS;
BgHakaSgami* this = (BgHakaSgami*)thisx;
Effect_Delete(globalCtx, this->blureEffectIndex[0]);
Effect_Delete(globalCtx, this->blureEffectIndex[1]);
@ -288,7 +286,7 @@ void BgHakaSgami_Spin(BgHakaSgami* this, GlobalContext* globalCtx) {
}
void BgHakaSgami_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaSgami* this = THIS;
BgHakaSgami* this = (BgHakaSgami*)thisx;
Player* player = GET_PLAYER(globalCtx);
if (!(player->stateFlags1 & 0x300000C0) || (this->actionFunc == BgHakaSgami_SetupSpin)) {
@ -297,7 +295,7 @@ void BgHakaSgami_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaSgami_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaSgami* this = THIS;
BgHakaSgami* this = (BgHakaSgami*)thisx;
if (this->unk_151 != 0) {
Gfx_DrawDListXlu(globalCtx, object_haka_objects_DL_00BF20);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgHakaShip*)thisx)
void BgHakaShip_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaShip_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaShip_Update(Actor* thisx, GlobalContext* globalCtx);
@ -40,7 +38,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHakaShip_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = THIS;
BgHakaShip* this = (BgHakaShip*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -69,7 +67,7 @@ void BgHakaShip_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaShip_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = THIS;
BgHakaShip* this = (BgHakaShip*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Audio_StopSfxByPos(&this->bellSoundPos);
@ -187,7 +185,7 @@ void BgHakaShip_CrashFall(BgHakaShip* this, GlobalContext* globalCtx) {
}
void BgHakaShip_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = THIS;
BgHakaShip* this = (BgHakaShip*)thisx;
this->actionFunc(this, globalCtx);
if (this->dyna.actor.params == 0) {
@ -196,7 +194,7 @@ void BgHakaShip_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = THIS;
BgHakaShip* this = (BgHakaShip*)thisx;
f32 angleTemp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 528);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHakaTrap*)thisx)
void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaTrap_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaTrap_Update(Actor* thisx, GlobalContext* globalCtx);
@ -109,7 +107,7 @@ static InitChainEntry sInitChain[] = {
void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
static UNK_TYPE D_80881014 = 0;
BgHakaTrap* this = THIS;
BgHakaTrap* this = (BgHakaTrap*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -186,7 +184,7 @@ void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaTrap_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTrap* this = THIS;
BgHakaTrap* this = (BgHakaTrap*)thisx;
if (this->dyna.actor.params != HAKA_TRAP_PROPELLER) {
if (this->dyna.actor.params != HAKA_TRAP_GUILLOTINE_SLOW) {
@ -481,7 +479,7 @@ void func_80880C0C(BgHakaTrap* this, GlobalContext* globalCtx) {
}
void BgHakaTrap_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTrap* this = THIS;
BgHakaTrap* this = (BgHakaTrap*)thisx;
Vec3f* actorPos = &this->dyna.actor.world.pos;
this->actionFunc(this, globalCtx);
@ -522,7 +520,7 @@ void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) {
object_haka_objects_DL_008A20, object_haka_objects_DL_0072C0,
};
static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 };
BgHakaTrap* this = THIS;
BgHakaTrap* this = (BgHakaTrap*)thisx;
s32 pad;
Vec3f sp2C;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHakaTubo*)thisx)
void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaTubo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaTubo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -79,7 +77,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTubo* this = THIS;
BgHakaTubo* this = (BgHakaTubo*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -97,7 +95,7 @@ void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaTubo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTubo* this = THIS;
BgHakaTubo* this = (BgHakaTubo*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->potCollider);
@ -214,7 +212,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, GlobalContext* globalCtx) {
}
void BgHakaTubo_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTubo* this = THIS;
BgHakaTubo* this = (BgHakaTubo*)thisx;
this->actionFunc(this, globalCtx);
this->fireScroll++;
@ -244,7 +242,7 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
}
void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaTubo* this = THIS;
BgHakaTubo* this = (BgHakaTubo*)thisx;
Gfx_DrawDListOpa(globalCtx, object_haka_objects_DL_00FE40);
BgHakaTubo_DrawFlameCircle(this, globalCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgHakaWater*)thisx)
void BgHakaWater_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaWater_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaWater_Update(Actor* thisx, GlobalContext* globalCtx);
@ -37,7 +35,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHakaWater_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaWater* this = THIS;
BgHakaWater* this = (BgHakaWater*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
if (Flags_GetSwitch(globalCtx, this->actor.params)) {
@ -102,13 +100,13 @@ void BgHakaWater_ChangeWaterLevel(BgHakaWater* this, GlobalContext* globalCtx) {
}
void BgHakaWater_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaWater* this = THIS;
BgHakaWater* this = (BgHakaWater*)thisx;
this->actionFunc(this, globalCtx);
}
void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaWater* this = THIS;
BgHakaWater* this = (BgHakaWater*)thisx;
s32 pad;
f32 temp;
s32 pad2;

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

@ -17,8 +17,6 @@ typedef enum {
/* 0x3 */ STA_UNKNOWN
} ShadowTempleAssetsType;
#define THIS ((BgHakaZou*)thisx)
void BgHakaZou_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaZou_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaZou_Update(Actor* thisx, GlobalContext* globalCtx);
@ -75,7 +73,7 @@ static InitChainEntry sInitChain[] = {
void BgHakaZou_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHakaZou* this = THIS;
BgHakaZou* this = (BgHakaZou*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
@ -124,7 +122,7 @@ void BgHakaZou_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaZou_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaZou* this = THIS;
BgHakaZou* this = (BgHakaZou*)thisx;
if (this->dyna.actor.params != STA_UNKNOWN) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -392,7 +390,7 @@ void BgHakaZou_DoNothing(BgHakaZou* this, GlobalContext* globalCtx) {
}
void BgHakaZou_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaZou* this = THIS;
BgHakaZou* this = (BgHakaZou*)thisx;
this->actionFunc(this, globalCtx);

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHeavyBlock*)thisx)
#define PIECE_FLAG_HIT_FLOOR (1 << 0)
void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx);
@ -84,7 +82,7 @@ void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, GlobalContext* globalCtx) {
}
void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHeavyBlock* this = THIS;
BgHeavyBlock* this = (BgHeavyBlock*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
@ -151,7 +149,7 @@ void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHeavyBlock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHeavyBlock* this = THIS;
BgHeavyBlock* this = (BgHeavyBlock*)thisx;
switch (this->dyna.actor.params & 0xFF) {
case HEAVYBLOCK_BIG_PIECE:
break;
@ -477,7 +475,7 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, GlobalContext* globalCtx) {
}
void BgHeavyBlock_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHeavyBlock* this = THIS;
BgHeavyBlock* this = (BgHeavyBlock*)thisx;
this->actionFunc(this, globalCtx);
}
@ -485,7 +483,7 @@ void BgHeavyBlock_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Vec3f D_80884EC8 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_80884ED4 = { 0.0f, 400.0f, 0.0f };
BgHeavyBlock* this = THIS;
BgHeavyBlock* this = (BgHeavyBlock*)thisx;
s32 pad;
Player* player = GET_PLAYER(globalCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHidanCurtain*)thisx)
void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx);
@ -69,7 +67,7 @@ const ActorInit Bg_Hidan_Curtain_InitVars = {
void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanCurtain* this = THIS;
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
BgHidanCurtainParams* hcParams;
osSyncPrintf("Curtain (arg_data 0x%04x)\n", this->actor.params);
@ -120,7 +118,7 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgHidanCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanCurtain* this = THIS;
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -203,7 +201,7 @@ void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, GlobalContext* globalCtx)
void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgHidanCurtain* this = THIS;
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
BgHidanCurtainParams* hcParams = &sHCParams[this->size];
f32 riseProgress;
@ -241,7 +239,7 @@ void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanCurtain* this = THIS;
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 685);
func_80093D84(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanDalm*)thisx)
void BgHidanDalm_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanDalm_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanDalm_Update(Actor* thisx, GlobalContext* globalCtx);
@ -97,7 +95,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHidanDalm_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanDalm* this = THIS;
BgHidanDalm* this = (BgHidanDalm*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -118,7 +116,7 @@ void BgHidanDalm_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanDalm_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanDalm* this = THIS;
BgHidanDalm* this = (BgHidanDalm*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyTris(globalCtx, &this->collider);
@ -179,7 +177,7 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, GlobalContext* globalCtx) {
}
void BgHidanDalm_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanDalm* this = THIS;
BgHidanDalm* this = (BgHidanDalm*)thisx;
this->actionFunc(this, globalCtx);
Actor_MoveForward(&this->dyna.actor);
@ -210,7 +208,7 @@ void BgHidanDalm_UpdateCollider(BgHidanDalm* this) {
}
void BgHidanDalm_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanDalm* this = THIS;
BgHidanDalm* this = (BgHidanDalm*)thisx;
if (this->dyna.actor.params == 0) {
Gfx_DrawDListOpa(globalCtx, gFireTempleHammerableTotemBodyDL);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanFirewall*)thisx)
void BgHidanFirewall_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFirewall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFirewall_Update(Actor* thisx, GlobalContext* globalCtx);
@ -58,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 1, 80, 100, MASS_IMMOVABLE };
void BgHidanFirewall_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
this->actor.scale.x = 0.12f;
this->actor.scale.z = 0.12f;
@ -77,7 +75,7 @@ void BgHidanFirewall_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanFirewall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -176,7 +174,7 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext*
}
void BgHidanFirewall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
s32 pad;
this->unk_150 = (this->unk_150 + 1) % 8;
@ -201,7 +199,7 @@ static void* sFireballTexs[] = {
};
void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 448);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHidanFslift*)thisx)
void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFslift_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFslift_Update(Actor* thisx, GlobalContext* globalCtx);
@ -41,7 +39,7 @@ static InitChainEntry sInitChain[] = {
void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad1;
BgHidanFslift* this = THIS;
BgHidanFslift* this = (BgHidanFslift*)thisx;
CollisionHeader* colHeader = NULL;
s32 pad2;
@ -69,7 +67,7 @@ void func_80886F24(BgHidanFslift* this) {
}
void BgHidanFslift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFslift* this = THIS;
BgHidanFslift* this = (BgHidanFslift*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -124,7 +122,7 @@ void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) {
}
void BgHidanFslift_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFslift* this = THIS;
BgHidanFslift* this = (BgHidanFslift*)thisx;
this->actionFunc(this, globalCtx);
if (func_8004356C(&this->dyna)) {

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

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHidanFwbig*)thisx)
typedef enum {
/* 0 */ FWBIG_MOVE,
/* 1 */ FWBIG_RESET,
@ -71,7 +69,7 @@ static InitChainEntry sInitChain[] = {
void BgHidanFwbig_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgHidanFwbig* this = THIS;
BgHidanFwbig* this = (BgHidanFwbig*)thisx;
Player* player = GET_PLAYER(globalCtx);
Actor_ProcessInitChain(&this->actor, sInitChain);
@ -108,7 +106,7 @@ void BgHidanFwbig_Init(Actor* thisx, GlobalContext* globalCtx2) {
void BgHidanFwbig_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanFwbig* this = THIS;
BgHidanFwbig* this = (BgHidanFwbig*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -220,7 +218,7 @@ void BgHidanFwbig_MoveCollider(BgHidanFwbig* this, GlobalContext* globalCtx) {
void BgHidanFwbig_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanFwbig* this = THIS;
BgHidanFwbig* this = (BgHidanFwbig*)thisx;
if (this->collider.base.atFlags & AT_HIT) {
this->collider.base.atFlags &= ~AT_HIT;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanHamstep*)thisx)
void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHamstep_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx);
@ -128,7 +126,7 @@ s32 BgHidanHamstep_SpawnChildren(BgHidanHamstep* this, GlobalContext* globalCtx2
}
void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
BgHidanHamstep* this = (BgHidanHamstep*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
Vec3f sp48[3];
@ -198,7 +196,7 @@ void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanHamstep_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
BgHidanHamstep* this = (BgHidanHamstep*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -392,7 +390,7 @@ void BgHidanHamstep_DoNothing(BgHidanHamstep* this, GlobalContext* globalCtx) {
}
void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
BgHidanHamstep* this = (BgHidanHamstep*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanHrock*)thisx)
void BgHidanHrock_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHrock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHrock_Update(Actor* thisx, GlobalContext* globalCtx);
@ -76,7 +74,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHidanHrock_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHrock* this = THIS;
BgHidanHrock* this = (BgHidanHrock*)thisx;
ColliderTrisElementInit* colliderElementInit;
Vec3f vertices[3];
f32 cosRotY;
@ -143,7 +141,7 @@ void BgHidanHrock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanHrock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHrock* this = THIS;
BgHidanHrock* this = (BgHidanHrock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyTris(globalCtx, &this->collider);
@ -225,7 +223,7 @@ void func_808896B8(BgHidanHrock* this, GlobalContext* globalCtx) {
}
void BgHidanHrock_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHrock* this = THIS;
BgHidanHrock* this = (BgHidanHrock*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHidanKousi*)thisx)
void BgHidanKousi_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanKousi_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanKousi_Update(Actor* thisx, GlobalContext* globalCtx);
@ -65,7 +63,7 @@ void BgHidanKousi_SetupAction(BgHidanKousi* this, BgHidanKousiActionFunc actionF
}
void BgHidanKousi_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKousi* this = THIS;
BgHidanKousi* this = (BgHidanKousi*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -91,7 +89,7 @@ void BgHidanKousi_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanKousi_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKousi* this = THIS;
BgHidanKousi* this = (BgHidanKousi*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -146,7 +144,7 @@ void func_80889D28(BgHidanKousi* this, GlobalContext* globalCtx) {
}
void BgHidanKousi_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKousi* this = THIS;
BgHidanKousi* this = (BgHidanKousi*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -11,8 +11,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanKowarerukabe*)thisx)
typedef enum {
/* 0 */ CRACKED_STONE_FLOOR,
/* 1 */ BOMBABLE_WALL,
@ -113,7 +111,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = THIS;
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
BgHidanKowarerukabe_InitDynaPoly(this, globalCtx);
@ -140,7 +138,7 @@ void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanKowarerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = THIS;
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -301,7 +299,7 @@ void BgHidanKowarerukabe_Break(BgHidanKowarerukabe* this, GlobalContext* globalC
}
void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = THIS;
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
s32 pad;
if (Actor_GetCollidedExplosive(globalCtx, &this->collider.base) != NULL) {
@ -323,7 +321,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = THIS;
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kowarerukabe.c", 565);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanRock*)thisx)
void BgHidanRock_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRock_Update(Actor* thisx, GlobalContext* globalCtx);
@ -69,7 +67,7 @@ static InitChainEntry sInitChain[] = {
};
void BgHidanRock_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRock* this = THIS;
BgHidanRock* this = (BgHidanRock*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -108,7 +106,7 @@ void BgHidanRock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanRock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRock* this = THIS;
BgHidanRock* this = (BgHidanRock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -330,7 +328,7 @@ void func_8088B990(BgHidanRock* this, GlobalContext* globalCtx) {
}
void BgHidanRock_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRock* this = THIS;
BgHidanRock* this = (BgHidanRock*)thisx;
this->actionFunc(this, globalCtx);
if (this->actionFunc == func_8088B79C) {
@ -379,7 +377,7 @@ void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) {
}
void BgHidanRock_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRock* this = THIS;
BgHidanRock* this = (BgHidanRock*)thisx;
s32 pad;
if (this->type == 0) {

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanRsekizou*)thisx)
void BgHidanRsekizou_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRsekizou_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRsekizou_Update(Actor* thisx, GlobalContext* globalCtx);
@ -122,7 +120,7 @@ static void* sFireballsTexs[] = {
};
void BgHidanRsekizou_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
BgHidanRsekizou* this = (BgHidanRsekizou*)thisx;
s32 i;
s32 pad;
CollisionHeader* colHeader;
@ -142,14 +140,14 @@ void BgHidanRsekizou_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanRsekizou_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
BgHidanRsekizou* this = (BgHidanRsekizou*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
}
void BgHidanRsekizou_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
BgHidanRsekizou* this = (BgHidanRsekizou*)thisx;
s32 i;
ColliderJntSphElement* sphere;
s32 pad;
@ -225,7 +223,7 @@ Gfx* BgHidanRsekizou_DrawFireball(GlobalContext* globalCtx, BgHidanRsekizou* thi
}
void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
BgHidanRsekizou* this = (BgHidanRsekizou*)thisx;
s32 i;
s32 pad;
MtxF mf;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanSekizou*)thisx)
void BgHidanSekizou_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSekizou_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSekizou_Update(Actor* thisx, GlobalContext* globalCtx);
@ -148,7 +146,7 @@ void func_8088CEC0(BgHidanSekizou* this, s32 arg1, s16 arg2) {
void BgHidanSekizou_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanSekizou* this = THIS;
BgHidanSekizou* this = (BgHidanSekizou*)thisx;
s32 i;
CollisionHeader* colHeader = NULL;
@ -178,7 +176,7 @@ void BgHidanSekizou_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgHidanSekizou_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgHidanSekizou* this = THIS;
BgHidanSekizou* this = (BgHidanSekizou*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -265,7 +263,7 @@ void func_8088D750(BgHidanSekizou* this, GlobalContext* globalCtx) {
void BgHidanSekizou_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgHidanSekizou* this = THIS;
BgHidanSekizou* this = (BgHidanSekizou*)thisx;
if (this->unk_170 != 0) {
this->unk_170--;
@ -392,7 +390,7 @@ void func_8088DE08(s16 arg0, s16 arg1, s32 arg2[]) {
void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgHidanSekizou* this = THIS;
BgHidanSekizou* this = (BgHidanSekizou*)thisx;
s32 i;
s32 sp6C[4];

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgHidanSima*)thisx)
void BgHidanSima_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSima_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSima_Update(Actor* thisx, GlobalContext* globalCtx);
@ -83,7 +81,7 @@ static void* sFireballsTexs[] = {
};
void BgHidanSima_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = THIS;
BgHidanSima* this = (BgHidanSima*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
s32 i;
@ -109,7 +107,7 @@ void BgHidanSima_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanSima_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = THIS;
BgHidanSima* this = (BgHidanSima*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -208,7 +206,7 @@ void func_8088E90C(BgHidanSima* this) {
}
void BgHidanSima_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = THIS;
BgHidanSima* this = (BgHidanSima*)thisx;
s32 pad;
this->actionFunc(this, globalCtx);
@ -278,7 +276,7 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) {
}
void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = THIS;
BgHidanSima* this = (BgHidanSima*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_sima.c", 641);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgHidanSyoku*)thisx)
void BgHidanSyoku_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSyoku_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanSyoku_Update(Actor* thisx, GlobalContext* globalCtx);
@ -38,7 +36,7 @@ static InitChainEntry sInitChain[] = {
void BgHidanSyoku_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgHidanSyoku* this = THIS;
BgHidanSyoku* this = (BgHidanSyoku*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -50,7 +48,7 @@ void BgHidanSyoku_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanSyoku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSyoku* this = THIS;
BgHidanSyoku* this = (BgHidanSyoku*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -107,7 +105,7 @@ void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx) {
}
void BgHidanSyoku_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSyoku* this = THIS;
BgHidanSyoku* this = (BgHidanSyoku*)thisx;
this->actionFunc(this, globalCtx);
if (func_8004356C(&this->dyna)) {

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgIceObjects*)thisx)
void BgIceObjects_Init(Actor* thisx, GlobalContext* globalCtx);
void BgIceObjects_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIceObjects_Update(Actor* thisx, GlobalContext* globalCtx);
@ -43,7 +41,7 @@ static InitChainEntry sInitChain[] = {
void BgIceObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIceObjects* this = THIS;
BgIceObjects* this = (BgIceObjects*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -57,7 +55,7 @@ void BgIceObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgIceObjects_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIceObjects* this = THIS;
BgIceObjects* this = (BgIceObjects*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -226,14 +224,14 @@ void BgIceObjects_Stuck(BgIceObjects* this, GlobalContext* globalCtx) {
void BgIceObjects_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIceObjects* this = THIS;
BgIceObjects* this = (BgIceObjects*)thisx;
this->actionFunc(this, globalCtx);
}
void BgIceObjects_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIceObjects* this = THIS;
BgIceObjects* this = (BgIceObjects*)thisx;
Gfx_DrawDListOpa(globalCtx, object_ice_objects_DL_000190);
}

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

@ -3,8 +3,6 @@
#define FLAGS 0x00000000
#define THIS ((BgIceShelter*)thisx)
void BgIceShelter_Init(Actor* thisx, GlobalContext* globalCtx);
void BgIceShelter_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIceShelter_Update(Actor* thisx, GlobalContext* globalCtx);
@ -133,7 +131,7 @@ static InitChainEntry sInitChain[] = {
void BgIceShelter_Init(Actor* thisx, GlobalContext* globalCtx) {
static Vec3f kzIceScale = { 0.18f, 0.27f, 0.24f };
BgIceShelter* this = THIS;
BgIceShelter* this = (BgIceShelter*)thisx;
s16 type = (this->dyna.actor.params >> 8) & 7;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -175,7 +173,7 @@ void BgIceShelter_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIceShelter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgIceShelter* this = THIS;
BgIceShelter* this = (BgIceShelter*)thisx;
switch ((this->dyna.actor.params >> 8) & 7) {
case 2:
@ -380,14 +378,14 @@ void func_808911D4(BgIceShelter* this, GlobalContext* globalCtx) {
}
void BgIceShelter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgIceShelter* this = THIS;
BgIceShelter* this = (BgIceShelter*)thisx;
this->actionFunc(this, globalCtx);
}
void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgIceShelter* this = THIS;
BgIceShelter* this = (BgIceShelter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ice_shelter.c", 748);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgIceShutter*)thisx)
void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx);
void BgIceShutter_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIceShutter_Update(Actor* thisx, GlobalContext* globalCtx);
@ -47,7 +45,7 @@ void func_80891AC0(BgIceShutter* this) {
}
void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIceShutter* this = THIS;
BgIceShutter* this = (BgIceShutter*)thisx;
f32 sp24;
CollisionHeader* colHeader;
s32 sp28;
@ -92,7 +90,7 @@ void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIceShutter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgIceShutter* this = THIS;
BgIceShutter* this = (BgIceShutter*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -126,7 +124,7 @@ void func_80891DD4(BgIceShutter* this, GlobalContext* globalCtx) {
}
void BgIceShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgIceShutter* this = THIS;
BgIceShutter* this = (BgIceShutter*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgIceTurara*)thisx)
void BgIceTurara_Init(Actor* thisx, GlobalContext* globalCtx);
void BgIceTurara_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIceTurara_Update(Actor* thisx, GlobalContext* globalCtx);
@ -62,7 +60,7 @@ static InitChainEntry sInitChain[] = {
};
void BgIceTurara_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIceTurara* this = THIS;
BgIceTurara* this = (BgIceTurara*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -83,7 +81,7 @@ void BgIceTurara_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIceTurara_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgIceTurara* this = THIS;
BgIceTurara* this = (BgIceTurara*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -193,7 +191,7 @@ void BgIceTurara_Regrow(BgIceTurara* this, GlobalContext* globalCtx) {
}
void BgIceTurara_Update(Actor* thisx, GlobalContext* globalCtx) {
BgIceTurara* this = THIS;
BgIceTurara* this = (BgIceTurara*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgInGate*)thisx)
void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx);
@ -36,7 +34,7 @@ void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) {
}
void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
BgInGate* this = (BgInGate*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -62,7 +60,7 @@ void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
BgInGate* this = (BgInGate*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -99,7 +97,7 @@ void BgInGate_DoNothing(BgInGate* this, GlobalContext* globalCtx) {
}
void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
BgInGate* this = (BgInGate*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJya1flift*)thisx)
void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJya1flift_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJya1flift_Update(Actor* thisx, GlobalContext* globalCtx);
@ -85,7 +83,7 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, GlobalContext* globalCtx, Colli
}
void BgJya1flift_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
BgJya1flift* this = THIS;
BgJya1flift* this = (BgJya1flift*)thisx;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
@ -93,7 +91,7 @@ void BgJya1flift_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJya1flift* this = THIS;
BgJya1flift* this = (BgJya1flift*)thisx;
// "1 F lift"
osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sIsSpawned, globalCtx->roomCtx.curRoom.num);
this->hasInitialized = false;
@ -115,7 +113,7 @@ void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJya1flift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJya1flift* this = THIS;
BgJya1flift* this = (BgJya1flift*)thisx;
if (this->hasInitialized) {
sIsSpawned = false;
@ -181,7 +179,7 @@ void BgJya1flift_DelayMove(BgJya1flift* this, GlobalContext* globalCtx) {
}
void BgJya1flift_Update(Actor* thisx, GlobalContext* globalCtx2) {
BgJya1flift* this = THIS;
BgJya1flift* this = (BgJya1flift*)thisx;
GlobalContext* globalCtx = globalCtx2;
s32 tempIsRiding;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaAmishutter*)thisx)
void BgJyaAmishutter_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaAmishutter_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaAmishutter_Update(Actor* thisx, GlobalContext* globalCtx);
@ -60,7 +58,7 @@ void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, GlobalContext* globalCt
}
void BgJyaAmishutter_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
BgJyaAmishutter* this = (BgJyaAmishutter*)thisx;
BgJyaAmishutter_InitDynaPoly(this, globalCtx, &gAmishutterCol, DPM_UNK);
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -68,7 +66,7 @@ void BgJyaAmishutter_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaAmishutter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
BgJyaAmishutter* this = (BgJyaAmishutter*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -120,7 +118,7 @@ void func_8089350C(BgJyaAmishutter* this) {
}
void BgJyaAmishutter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
BgJyaAmishutter* this = (BgJyaAmishutter*)thisx;
this->actionFunc(this);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgJyaBigmirror*)thisx)
void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBigmirror_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBigmirror_Update(Actor* thisx, GlobalContext* globalCtx);
@ -43,7 +41,7 @@ static BigMirrorDataEntry sCobraSpawnData[] = {
};
void BgJyaBigmirror_SetRoomFlag(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
this->puzzleFlags &=
~(BIGMIR_PUZZLE_IN_STATUE_ROOM | BIGMIR_PUZZLE_IN_1ST_TOP_ROOM | BIGMIR_PUZZLE_IN_2ND_TOP_ROOM);
@ -58,7 +56,7 @@ void BgJyaBigmirror_SetRoomFlag(Actor* thisx, GlobalContext* globalCtx) {
void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
static u8 cobraPuzzleFlags[] = { BIGMIR_PUZZLE_COBRA1_SOLVED, BIGMIR_PUZZLE_COBRA2_SOLVED };
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
BigMirrorDataEntry* curSpawnData;
BigmirrorCobra* curCobraInfo;
s32 i;
@ -109,7 +107,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBigmirror_SetBombiwaFlag(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
if (Flags_GetSwitch(globalCtx, 0x29)) {
this->puzzleFlags |= BIGMIR_PUZZLE_BOMBIWA_DESTROYED;
@ -125,7 +123,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) {
{ -560.0f, 1800.0f, -310.0f },
{ 60.0f, 1800.0f, -310.0f },
};
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
s32 puzzleSolved;
s32 lightBeamToggles[3];
s32 i;
@ -175,7 +173,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
if (sIsSpawned) {
Actor_Kill(&this->actor);
@ -195,7 +193,7 @@ void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBigmirror_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
if (this->spawned) {
sIsSpawned = false;
@ -211,7 +209,7 @@ void BgJyaBigmirror_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
static Vec3s D_80893F4C = { 0, 0, 0 };
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
Actor* lift;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bigmirror.c", 435);
@ -240,7 +238,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = THIS;
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
if (this->puzzleFlags & BIGMIR_PUZZLE_IN_1ST_TOP_ROOM) {
Gfx_DrawDListOpa(globalCtx, gBigMirror3DL);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaBlock*)thisx)
void BgJyaBlock_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBlock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBlock_Update(Actor* thisx, GlobalContext* globalCtx);
@ -37,7 +35,7 @@ static InitChainEntry sInitChain[] = {
void BgJyaBlock_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgJyaBlock* this = THIS;
BgJyaBlock* this = (BgJyaBlock*)thisx;
CollisionHeader* colHeader = NULL;
DynaPolyActor_Init(&this->dyna, 0);
@ -51,13 +49,13 @@ void BgJyaBlock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBlock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBlock* this = THIS;
BgJyaBlock* this = (BgJyaBlock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void BgJyaBlock_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBlock* this = THIS;
BgJyaBlock* this = (BgJyaBlock*)thisx;
Player* player = GET_PLAYER(globalCtx);
player->stateFlags2 &= ~0x10;

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

@ -3,8 +3,6 @@
#include "objects/object_jya_obj/object_jya_obj.h"
#define FLAGS 0x00000001
#define THIS ((BgJyaBombchuiwa*)thisx)
void BgJyaBombchuiwa_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBombchuiwa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx);
@ -76,7 +74,7 @@ void BgJyaBombchuiwa_SetDrawFlags(BgJyaBombchuiwa* this, u8 drawFlags) {
}
void BgJyaBombchuiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombchuiwa* this = THIS;
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
BgJyaBombchuiwa_SetupCollider(this, globalCtx);
@ -90,7 +88,7 @@ void BgJyaBombchuiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgJyaBombchuiwa_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgJyaBombchuiwa* this = THIS;
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -190,7 +188,7 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, GlobalContext* globalC
}
void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombchuiwa* this = THIS;
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);
@ -207,7 +205,7 @@ void BgJyaBombchuiwa_DrawRock(GlobalContext* globalCtx) {
}
void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombchuiwa* this = THIS;
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 453);
func_80093D84(globalCtx->state.gfxCtx);
@ -224,7 +222,7 @@ void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) {
void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Vec3f D_80894F88 = { -920.0f, 480.0f, -889.0f };
static Vec3s D_80894F94 = { 0, 0, 0 };
BgJyaBombchuiwa* this = THIS;
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
if (this->drawFlags & 1) {
Gfx_DrawDListOpa(globalCtx, gBombchuiwaDL);

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

@ -11,8 +11,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaBombiwa*)thisx)
void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaBombiwa_Update(Actor* thisx, GlobalContext* globalCtx);
@ -88,7 +86,7 @@ void BgJyaBombiwa_InitCollider(BgJyaBombiwa* this, GlobalContext* globalCtx) {
}
void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombiwa* this = THIS;
BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
if ((this->dyna.actor.params & 0x3F) != 0x29) {
osSyncPrintf(VT_COL(YELLOW, BLACK));
@ -111,7 +109,7 @@ void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombiwa* this = THIS;
BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -162,7 +160,7 @@ void BgJyaBombiwa_Break(BgJyaBombiwa* this, GlobalContext* globalCtx) {
}
void BgJyaBombiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombiwa* this = THIS;
BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
if (this->collider.base.acFlags & AC_HIT) {
BgJyaBombiwa_Break(this, globalCtx);
@ -175,7 +173,7 @@ void BgJyaBombiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBombiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombiwa* this = THIS;
BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
Gfx_DrawDListOpa(globalCtx, gBombiwaDL);
Collider_UpdateSpheres(0, &this->collider);

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

@ -6,8 +6,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJyaCobra*)thisx)
void BgJyaCobra_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaCobra_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx);
@ -397,7 +395,7 @@ void BgJyaCobra_UpdateShadowFromTop(BgJyaCobra* this) {
}
void BgJyaCobra_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaCobra* this = THIS;
BgJyaCobra* this = (BgJyaCobra*)thisx;
BgJyaCobra_InitDynapoly(this, globalCtx, &gCobraCol, DPM_UNK);
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -425,7 +423,7 @@ void BgJyaCobra_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaCobra_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaCobra* this = THIS;
BgJyaCobra* this = (BgJyaCobra*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -514,7 +512,7 @@ void func_80896ABC(BgJyaCobra* this, GlobalContext* globalCtx) {
void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgJyaCobra* this = THIS;
BgJyaCobra* this = (BgJyaCobra*)thisx;
this->actionFunc(this, globalCtx);
@ -602,7 +600,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
}
void BgJyaCobra_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgJyaCobra* this = THIS;
BgJyaCobra* this = (BgJyaCobra*)thisx;
func_80896CB4(globalCtx);
Gfx_DrawDListOpa(globalCtx, gCobra1DL);

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJyaGoroiwa*)thisx)
void BgJyaGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaGoroiwa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx);
@ -97,7 +95,7 @@ void BgJyaGoroiwa_UpdateRotation(BgJyaGoroiwa* this) {
}
void BgJyaGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaGoroiwa* this = THIS;
BgJyaGoroiwa* this = (BgJyaGoroiwa*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
BgJyaGoroiwa_InitCollider(this, globalCtx);
@ -109,7 +107,7 @@ void BgJyaGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaGoroiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaGoroiwa* this = THIS;
BgJyaGoroiwa* this = (BgJyaGoroiwa*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -197,7 +195,7 @@ void BgJyaGoroiwa_Wait(BgJyaGoroiwa* this, GlobalContext* globalCtx) {
void BgJyaGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgJyaGoroiwa* this = THIS;
BgJyaGoroiwa* this = (BgJyaGoroiwa*)thisx;
Player* player = GET_PLAYER(globalCtx);
s32 bgId;
Vec3f pos;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJyaHaheniron*)thisx)
void BgJyaHaheniron_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaHaheniron_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaHaheniron_Update(Actor* thisx, GlobalContext* globalCtx);
@ -119,7 +117,7 @@ void BgJyaHaheniron_SpawnFragments(GlobalContext* globalCtx, Vec3f* vec1, Vec3f*
void BgJyaHaheniron_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgJyaHaheniron* this = THIS;
BgJyaHaheniron* this = (BgJyaHaheniron*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
Actor_SetScale(&this->actor, D_80898794[this->actor.params]);
@ -136,7 +134,7 @@ void BgJyaHaheniron_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgJyaHaheniron_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgJyaHaheniron* this = THIS;
BgJyaHaheniron* this = (BgJyaHaheniron*)thisx;
if (this->actor.params == 0) {
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -197,7 +195,7 @@ void BgJyaHaheniron_RubbleCollide(BgJyaHaheniron* this, GlobalContext* globalCtx
void BgJyaHaheniron_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgJyaHaheniron* this = THIS;
BgJyaHaheniron* this = (BgJyaHaheniron*)thisx;
this->timer++;
this->actionFunc(this, globalCtx);
@ -210,7 +208,7 @@ void BgJyaHaheniron_Draw(Actor* thisx, GlobalContext* globalCtx) {
gObjectJyaIronDL_000600,
};
s32 pad;
BgJyaHaheniron* this = THIS;
BgJyaHaheniron* this = (BgJyaHaheniron*)thisx;
if (this->actor.params == 0) {
Collider_UpdateSpheres(0, &this->collider);

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaIronobj*)thisx)
typedef void (*BgJyaIronobjIkFunc)(BgJyaIronobj*, GlobalContext*, EnIk*);
void BgJyaIronobj_Init(Actor* thisx, GlobalContext* globalCtx);
@ -216,7 +214,7 @@ void BgJyaIronobj_SpawnThoneParticles(BgJyaIronobj* this, GlobalContext* arg1, E
}
void BgJyaIronobj_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaIronobj* this = THIS;
BgJyaIronobj* this = (BgJyaIronobj*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -229,7 +227,7 @@ void BgJyaIronobj_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaIronobj_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaIronobj* this = THIS;
BgJyaIronobj* this = (BgJyaIronobj*)thisx;
Collider_DestroyCylinder(globalCtx, &this->colCylinder);
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -267,7 +265,7 @@ void func_808992E8(BgJyaIronobj* this, GlobalContext* globalCtx) {
}
void BgJyaIronobj_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaIronobj* this = THIS;
BgJyaIronobj* this = (BgJyaIronobj*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaKanaami*)thisx)
void BgJyaKanaami_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaKanaami_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaKanaami_Update(Actor* thisx, GlobalContext* globalCtx);
@ -56,7 +54,7 @@ void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, GlobalContext* globalCtx, Col
}
void BgJyaKanaami_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
BgJyaKanaami* this = (BgJyaKanaami*)thisx;
BgJyaKanaami_InitDynaPoly(this, globalCtx, &gKanaamiCol, DPM_UNK);
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -69,7 +67,7 @@ void BgJyaKanaami_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaKanaami_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
BgJyaKanaami* this = (BgJyaKanaami*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -117,7 +115,7 @@ void func_80899A08(BgJyaKanaami* this) {
}
void BgJyaKanaami_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
BgJyaKanaami* this = (BgJyaKanaami*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJyaLift*)thisx)
void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaLift_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaLift_Update(Actor* thisx, GlobalContext* globalCtx);
@ -53,7 +51,7 @@ void BgJyaLift_InitDynapoly(BgJyaLift* this, GlobalContext* globalCtx, Collision
}
void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaLift* this = THIS;
BgJyaLift* this = (BgJyaLift*)thisx;
this->isSpawned = false;
if (sIsSpawned) {
@ -76,7 +74,7 @@ void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaLift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaLift* this = THIS;
BgJyaLift* this = (BgJyaLift*)thisx;
if (this->isSpawned) {
@ -131,7 +129,7 @@ void BgJyaLift_SetFinalPosY(BgJyaLift* this) {
}
void BgJyaLift_Update(Actor* thisx, GlobalContext* globalCtx2) {
BgJyaLift* this = THIS;
BgJyaLift* this = (BgJyaLift*)thisx;
GlobalContext* globalCtx = globalCtx2;
if (this->actionFunc != NULL) {

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

@ -4,8 +4,6 @@
#define FLAGS 0x00000000
#define THIS ((BgJyaMegami*)thisx)
void BgJyaMegami_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaMegami_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaMegami_Update(Actor* thisx, GlobalContext* globalCtx);
@ -153,7 +151,7 @@ void BgJyaMegami_SetupSpawnEffect(BgJyaMegami* this, GlobalContext* globalCtx, f
}
void BgJyaMegami_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaMegami* this = THIS;
BgJyaMegami* this = (BgJyaMegami*)thisx;
BgJyaMegami_InitDynaPoly(this, globalCtx, &GMegamiCol, DPM_UNK);
BgJyaMegami_InitCollider(this, globalCtx);
@ -167,7 +165,7 @@ void BgJyaMegami_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaMegami_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaMegami* this = THIS;
BgJyaMegami* this = (BgJyaMegami*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -282,7 +280,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, GlobalContext* globalCtx) {
}
void BgJyaMegami_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaMegami* this = THIS;
BgJyaMegami* this = (BgJyaMegami*)thisx;
this->actionFunc(this, globalCtx);
}
@ -344,7 +342,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) {
}
void BgJyaMegami_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgJyaMegami* this = THIS;
BgJyaMegami* this = (BgJyaMegami*)thisx;
Collider_UpdateSpheres(0, &this->collider);
if (this->actionFunc == BgJyaMegami_Explode) {

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgJyaZurerukabe*)thisx)
void BgJyaZurerukabe_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaZurerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaZurerukabe_Update(Actor* thisx, GlobalContext* globalCtx);
@ -110,7 +108,7 @@ void func_8089B4C8(BgJyaZurerukabe* this, GlobalContext* globalCtx) {
}
void BgJyaZurerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaZurerukabe* this = THIS;
BgJyaZurerukabe* this = (BgJyaZurerukabe*)thisx;
s32 i;
BgJyaZurerukabe_InitDynaPoly(this, globalCtx, &gZurerukabeCol, DPM_UNK);
@ -136,7 +134,7 @@ void BgJyaZurerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaZurerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaZurerukabe* this = THIS;
BgJyaZurerukabe* this = (BgJyaZurerukabe*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
D_8089B9C0[this->unk_168] = 0.0f;
@ -173,7 +171,7 @@ void func_8089B870(BgJyaZurerukabe* this, GlobalContext* globalCtx) {
}
void BgJyaZurerukabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaZurerukabe* this = THIS;
BgJyaZurerukabe* this = (BgJyaZurerukabe*)thisx;
if (this->unk_16A > 0) {
this->unk_16A--;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000020
#define THIS ((BgMenkuriEye*)thisx)
void BgMenkuriEye_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriEye_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriEye_Update(Actor* thisx, GlobalContext* globalCtx);
@ -62,7 +60,7 @@ static InitChainEntry sInitChain[] = {
};
void BgMenkuriEye_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = THIS;
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
ColliderJntSphElement* colliderList;
Actor_ProcessInitChain(&this->actor, sInitChain);
@ -80,13 +78,13 @@ void BgMenkuriEye_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriEye_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = THIS;
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
void BgMenkuriEye_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = THIS;
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
if (!Flags_GetSwitch(globalCtx, this->actor.params)) {
if (this->framesUntilDisable != -1) {
@ -120,7 +118,7 @@ void BgMenkuriEye_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = THIS;
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 292);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgMenkuriKaiten*)thisx)
void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriKaiten_Update(Actor* thisx, GlobalContext* globalCtx);
@ -33,7 +31,7 @@ static InitChainEntry sInitChain[] = {
};
void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -44,13 +42,13 @@ void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void BgMenkuriKaiten_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx;
if (!Flags_GetSwitch(globalCtx, this->dyna.actor.params) && func_80043590(&this->dyna)) {
func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgMenkuriNisekabe*)thisx)
void BgMenkuriNisekabe_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMenkuriNisekabe_Update(Actor* thisx, GlobalContext* globalCtx);
@ -31,7 +29,7 @@ const ActorInit Bg_Menkuri_Nisekabe_InitVars = {
static Gfx* sDLists[] = { gGTGFakeWallDL, gGTGFakeCeilingDL };
void BgMenkuriNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
BgMenkuriNisekabe* this = (BgMenkuriNisekabe*)thisx;
Actor_SetScale(&this->actor, 0.1f);
}
@ -40,7 +38,7 @@ void BgMenkuriNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriNisekabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
BgMenkuriNisekabe* this = (BgMenkuriNisekabe*)thisx;
if (globalCtx->actorCtx.unk_03 != 0) {
this->actor.flags |= 0x80;
@ -50,7 +48,7 @@ void BgMenkuriNisekabe_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
BgMenkuriNisekabe* this = (BgMenkuriNisekabe*)thisx;
u32 index = this->actor.params & 0xFF;
if ((this->actor.flags & 0x80) == 0x80) {

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMizuBwall*)thisx)
void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMizuBwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMizuBwall_Update(Actor* thisx, GlobalContext* globalCtx);
@ -173,7 +171,7 @@ void BgMizuBwall_RotateVec3f(Vec3f* out, Vec3f* in, f32 sin, f32 cos) {
void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuBwall* this = THIS;
BgMizuBwall* this = (BgMizuBwall*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, D_8089D854);
@ -374,7 +372,7 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMizuBwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuBwall* this = THIS;
BgMizuBwall* this = (BgMizuBwall*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyTris(globalCtx, &this->collider);
@ -496,13 +494,13 @@ void BgMizuBwall_DoNothing(BgMizuBwall* this, GlobalContext* globalCtx) {
void BgMizuBwall_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuBwall* this = THIS;
BgMizuBwall* this = (BgMizuBwall*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BgMizuBwall* this = THIS;
BgMizuBwall* this = (BgMizuBwall*)thisx;
GlobalContext* globalCtx = globalCtx2;
u32 frames;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMizuMovebg*)thisx)
#define MOVEBG_TYPE(params) (((u16)(params) >> 0xC) & 0xF)
#define MOVEBG_FLAGS(params) ((u16)(params)&0x3F)
#define MOVEBG_PATH_ID(params) (((u16)(params) >> 0x8) & 0xF)
@ -89,64 +87,64 @@ void BgMizuMovebg_Init(Actor* thisx, GlobalContext* globalCtx) {
Vec3f sp48;
Actor_ProcessInitChain(thisx, D_8089EB90);
THIS->homeY = thisx->world.pos.y;
THIS->dlist = D_8089EB50[MOVEBG_TYPE(thisx->params)];
DynaPolyActor_Init(&THIS->dyna, DPM_PLAYER);
((BgMizuMovebg*)thisx)->homeY = thisx->world.pos.y;
((BgMizuMovebg*)thisx)->dlist = D_8089EB50[MOVEBG_TYPE(thisx->params)];
DynaPolyActor_Init(&((BgMizuMovebg*)thisx)->dyna, DPM_PLAYER);
CollisionHeader_GetVirtual(D_8089EB70[MOVEBG_TYPE(thisx->params)], &colHeader);
THIS->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
((BgMizuMovebg*)thisx)->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
type = MOVEBG_TYPE(thisx->params);
switch (type) {
case 0:
temp = waterBoxes[2].ySurface + 15.0f;
if (temp < THIS->homeY - 700.0f) {
thisx->world.pos.y = THIS->homeY - 700.0f;
if (temp < ((BgMizuMovebg*)thisx)->homeY - 700.0f) {
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY - 700.0f;
} else {
thisx->world.pos.y = temp;
}
THIS->actionFunc = func_8089E318;
((BgMizuMovebg*)thisx)->actionFunc = func_8089E318;
break;
case 1:
temp = waterBoxes[2].ySurface + 15.0f;
if (temp < THIS->homeY - 710.0f) {
thisx->world.pos.y = THIS->homeY - 710.0f;
if (temp < ((BgMizuMovebg*)thisx)->homeY - 710.0f) {
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY - 710.0f;
} else {
thisx->world.pos.y = temp;
}
THIS->actionFunc = func_8089E318;
((BgMizuMovebg*)thisx)->actionFunc = func_8089E318;
break;
case 2:
temp = waterBoxes[2].ySurface + 15.0f;
if (temp < THIS->homeY - 700.0f) {
thisx->world.pos.y = THIS->homeY - 700.0f;
if (temp < ((BgMizuMovebg*)thisx)->homeY - 700.0f) {
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY - 700.0f;
} else {
thisx->world.pos.y = temp;
}
THIS->actionFunc = func_8089E318;
((BgMizuMovebg*)thisx)->actionFunc = func_8089E318;
break;
case 3:
thisx->world.pos.y = THIS->homeY + D_8089EB40[func_8089DC30(globalCtx)];
THIS->actionFunc = func_8089E318;
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY + D_8089EB40[func_8089DC30(globalCtx)];
((BgMizuMovebg*)thisx)->actionFunc = func_8089E318;
break;
case 4:
case 5:
case 6:
if (Flags_GetSwitch(globalCtx, MOVEBG_FLAGS(thisx->params))) {
thisx->world.pos.y = THIS->homeY + 115.19999999999999;
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY + 115.19999999999999;
} else {
thisx->world.pos.y = THIS->homeY;
thisx->world.pos.y = ((BgMizuMovebg*)thisx)->homeY;
}
THIS->actionFunc = func_8089E318;
((BgMizuMovebg*)thisx)->actionFunc = func_8089E318;
break;
case 7:
THIS->scrollAlpha1 = 160;
THIS->scrollAlpha2 = 160;
THIS->scrollAlpha3 = 160;
THIS->scrollAlpha4 = 160;
((BgMizuMovebg*)thisx)->scrollAlpha1 = 160;
((BgMizuMovebg*)thisx)->scrollAlpha2 = 160;
((BgMizuMovebg*)thisx)->scrollAlpha3 = 160;
((BgMizuMovebg*)thisx)->scrollAlpha4 = 160;
waypointId = MOVEBG_POINT_ID(thisx->params);
THIS->waypointId = waypointId;
((BgMizuMovebg*)thisx)->waypointId = waypointId;
func_8089E108(globalCtx->setupPathList, &thisx->world.pos, MOVEBG_PATH_ID(thisx->params), waypointId);
THIS->actionFunc = func_8089E650;
((BgMizuMovebg*)thisx)->actionFunc = func_8089E650;
break;
}
@ -170,7 +168,7 @@ void BgMizuMovebg_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMizuMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMizuMovebg* this = THIS;
BgMizuMovebg* this = (BgMizuMovebg*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
switch (MOVEBG_TYPE(thisx->params)) {
@ -354,13 +352,13 @@ void func_8089E650(BgMizuMovebg* this, GlobalContext* globalCtx) {
}
void BgMizuMovebg_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMizuMovebg* this = THIS;
BgMizuMovebg* this = (BgMizuMovebg*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BgMizuMovebg* this = THIS;
BgMizuMovebg* this = (BgMizuMovebg*)thisx;
GlobalContext* globalCtx = globalCtx2;
u32 frames;

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

@ -3,8 +3,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMizuShutter*)thisx)
#define SIZE_PARAM (((u16)this->dyna.actor.params >> 0xC) & 0xF)
#define TIMER_PARAM (((u16)this->dyna.actor.params >> 6) & 0x3F)
@ -51,7 +49,7 @@ static InitChainEntry sInitChain[] = {
void BgMizuShutter_Init(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = THIS;
BgMizuShutter* this = (BgMizuShutter*)thisx;
s32 pad2;
CollisionHeader* sp30 = NULL;
s32 pad3;
@ -87,7 +85,7 @@ void BgMizuShutter_Init(BgMizuShutter* thisx, GlobalContext* globalCtx) {
void BgMizuShutter_Destroy(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = THIS;
BgMizuShutter* this = (BgMizuShutter*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -150,14 +148,14 @@ void BgMizuShutter_WaitForTimer(BgMizuShutter* this, GlobalContext* globalCtx) {
void BgMizuShutter_Update(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = THIS;
BgMizuShutter* this = (BgMizuShutter*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = THIS;
BgMizuShutter* this = (BgMizuShutter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_shutter.c", 410);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgMizuUzu*)thisx)
void BgMizuUzu_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMizuUzu_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMizuUzu_Update(Actor* thisx, GlobalContext* globalCtx);
@ -38,7 +36,7 @@ static InitChainEntry sInitChain[] = {
void BgMizuUzu_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuUzu* this = THIS;
BgMizuUzu* this = (BgMizuUzu*)thisx;
CollisionHeader* colHeader = NULL;
s32 pad2;
@ -50,7 +48,7 @@ void BgMizuUzu_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMizuUzu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMizuUzu* this = THIS;
BgMizuUzu* this = (BgMizuUzu*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -68,7 +66,7 @@ void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) {
}
void BgMizuUzu_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMizuUzu* this = THIS;
BgMizuUzu* this = (BgMizuUzu*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgMizuWater*)thisx)
void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMizuWater_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMizuWater_Update(Actor* thisx, GlobalContext* globalCtx);
@ -91,7 +89,7 @@ void BgMizuWater_SetWaterBoxesHeight(WaterBox* waterBoxes, s16 height) {
}
void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMizuWater* this = THIS;
BgMizuWater* this = (BgMizuWater*)thisx;
f32 initialActorY;
WaterBox* waterBoxes;
s32 waterLevelActionIndex;
@ -293,7 +291,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) {
}
void BgMizuWater_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMizuWater* this = THIS;
BgMizuWater* this = (BgMizuWater*)thisx;
s32 posY;
s32 unk0;
s32 unk1;
@ -327,7 +325,7 @@ void BgMizuWater_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMizuWater* this = THIS;
BgMizuWater* this = (BgMizuWater*)thisx;
s32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 738);

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

@ -16,8 +16,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMjin*)thisx)
void BgMjin_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMjin_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMjin_Update(Actor* thisx, GlobalContext* globalCtx);
@ -55,7 +53,7 @@ void BgMjin_SetupAction(BgMjin* this, BgMjinActionFunc actionFunc) {
}
void BgMjin_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
BgMjin* this = (BgMjin*)thisx;
s8 objBankIndex;
Actor_ProcessInitChain(thisx, sInitChain);
@ -69,7 +67,7 @@ void BgMjin_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMjin_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
BgMjin* this = (BgMjin*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -96,13 +94,13 @@ void BgMjin_DoNothing(BgMjin* this, GlobalContext* globalCtx) {
}
void BgMjin_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
BgMjin* this = (BgMjin*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
BgMjin* this = (BgMjin*)thisx;
Gfx* dlist;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMoriBigst*)thisx)
void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriBigst_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriBigst_Update(Actor* thisx, GlobalContext* globalCtx);
@ -69,7 +67,7 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, GlobalContext* globalCtx, Colli
void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = THIS;
BgMoriBigst* this = (BgMoriBigst*)thisx;
// "mori (bigST.keyceiling)"
osSyncPrintf("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", this->dyna.actor.params,
@ -97,7 +95,7 @@ void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriBigst_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = THIS;
BgMoriBigst* this = (BgMoriBigst*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -227,7 +225,7 @@ void BgMoriBigst_SetupDone(BgMoriBigst* this, GlobalContext* globalCtx) {
void BgMoriBigst_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = THIS;
BgMoriBigst* this = (BgMoriBigst*)thisx;
Actor_SetFocus(&this->dyna.actor, 50.0f);
if (this->waitTimer > 0) {
@ -243,7 +241,7 @@ void BgMoriBigst_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = THIS;
BgMoriBigst* this = (BgMoriBigst*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 541);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -3,8 +3,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMoriElevator*)thisx)
void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriElevator_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriElevator_Update(Actor* thisx, GlobalContext* globalCtx);
@ -84,7 +82,7 @@ void func_808A18FC(BgMoriElevator* this, f32 distTo) {
}
void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMoriElevator* this = THIS;
BgMoriElevator* this = (BgMoriElevator*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -115,7 +113,7 @@ void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMoriElevator_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMoriElevator* this = THIS;
BgMoriElevator* this = (BgMoriElevator*)thisx;
if (this->unk_172 == 0) {
// "Forest Temple elevator DT"
@ -242,7 +240,7 @@ void func_808A2008(BgMoriElevator* this, GlobalContext* globalCtx) {
}
void BgMoriElevator_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMoriElevator* this = THIS;
BgMoriElevator* this = (BgMoriElevator*)thisx;
this->actionFunc(this, globalCtx);
this->unk_170 = this->dyna.unk_160;
@ -251,7 +249,7 @@ void BgMoriElevator_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriElevator* this = THIS;
BgMoriElevator* this = (BgMoriElevator*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 575);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgMoriHashigo*)thisx)
void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHashigo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHashigo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -154,7 +152,7 @@ s32 BgMoriHashigo_InitLadder(BgMoriHashigo* this, GlobalContext* globalCtx) {
void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = THIS;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
if (this->dyna.actor.params == HASHIGO_CLASP) {
if (!BgMoriHashigo_InitClasp(this, globalCtx)) {
@ -182,7 +180,7 @@ void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriHashigo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = THIS;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
if (this->dyna.actor.params == HASHIGO_LADDER) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -269,7 +267,7 @@ void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this) {
void BgMoriHashigo_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = THIS;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
if (this->hitTimer > 0) {
this->hitTimer--;
@ -281,7 +279,7 @@ void BgMoriHashigo_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = THIS;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 516);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgMoriHashira4*)thisx)
void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHashira4_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHashira4_Update(Actor* thisx, GlobalContext* globalCtx);
@ -70,7 +68,7 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, GlobalContext* globalCtx,
void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = THIS;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
this->switchFlag = (this->dyna.actor.params >> 8) & 0x3F;
this->dyna.actor.params &= 0xFF;
@ -102,7 +100,7 @@ void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriHashira4_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = THIS;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -152,7 +150,7 @@ void BgMoriHashira4_GateOpen(BgMoriHashira4* this, GlobalContext* globalCtx) {
void BgMoriHashira4_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = THIS;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);
@ -161,7 +159,7 @@ void BgMoriHashira4_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = THIS;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 339);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -15,8 +15,6 @@
#define FLAGS 0x00000030
#define THIS ((BgMoriHineri*)thisx)
void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHineri_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriHineri_Update(Actor* thisx, GlobalContext* globalCtx);
@ -55,7 +53,7 @@ static Gfx* sDLists[] = {
};
void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMoriHineri* this = THIS;
BgMoriHineri* this = (BgMoriHineri*)thisx;
s8 moriHineriObjIdx;
u32 switchFlagParam;
s32 t6;
@ -108,7 +106,7 @@ void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMoriHineri_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMoriHineri* this = THIS;
BgMoriHineri* this = (BgMoriHineri*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -222,13 +220,13 @@ void func_808A3E54(BgMoriHineri* this, GlobalContext* globalCtx) {
}
void BgMoriHineri_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMoriHineri* this = THIS;
BgMoriHineri* this = (BgMoriHineri*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
BgMoriHineri* this = THIS;
BgMoriHineri* this = (BgMoriHineri*)thisx;
s8 objIndex;
MtxF mtx;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgMoriIdomizu*)thisx)
void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriIdomizu_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriIdomizu_Update(Actor* thisx, GlobalContext* globalCtx);
@ -49,7 +47,7 @@ void BgMoriIdomizu_SetWaterLevel(GlobalContext* globalCtx, s16 waterLevel) {
void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriIdomizu* this = THIS;
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
if (sIsSpawned) {
Actor_Kill(&this->actor);
@ -86,7 +84,7 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriIdomizu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriIdomizu* this = THIS;
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
if (this->isLoaded) {
sIsSpawned = false;
@ -152,7 +150,7 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, GlobalContext* globalCtx) {
void BgMoriIdomizu_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriIdomizu* this = THIS;
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);
@ -161,7 +159,7 @@ void BgMoriIdomizu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriIdomizu* this = THIS;
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
u32 gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 356);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgMoriKaitenkabe*)thisx)
void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriKaitenkabe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriKaitenkabe_Update(Actor* thisx, GlobalContext* globalCtx);
@ -49,7 +47,7 @@ void BgMoriKaitenkabe_CrossProduct(Vec3f* dest, Vec3f* v1, Vec3f* v2) {
void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = THIS;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
CollisionHeader* colHeader = NULL;
// "Forest Temple object 【Rotating Wall (arg_data: 0x% 04x)】 appears"
@ -70,7 +68,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriKaitenkabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = THIS;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -153,14 +151,14 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, GlobalContext* globalCtx) {
void BgMoriKaitenkabe_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = THIS;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
this->actionFunc(this, globalCtx);
}
void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = THIS;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((BgMoriRakkatenjo*)thisx)
void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMoriRakkatenjo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -49,7 +47,7 @@ static InitChainEntry sInitChain[] = {
void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = THIS;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
CollisionHeader* colHeader = NULL;
DynaPolyActor_Init(&this->dyna, DPM_PLAYER);
@ -81,7 +79,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriRakkatenjo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = THIS;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -199,7 +197,7 @@ void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, GlobalContext* globalCtx) {
void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = THIS;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
if (this->timer > 0) {
this->timer--;
@ -221,7 +219,7 @@ void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = THIS;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497);
func_80093D18(globalCtx->state.gfxCtx);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgPoEvent*)thisx)
void BgPoEvent_Init(Actor* thisx, GlobalContext* globalCtx);
void BgPoEvent_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgPoEvent_Update(Actor* thisx, GlobalContext* globalCtx);
@ -195,7 +193,7 @@ static InitChainEntry sInitChain[] = {
void BgPoEvent_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgPoEvent* this = THIS;
BgPoEvent* this = (BgPoEvent*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
this->type = (thisx->params >> 8) & 0xF;
@ -222,7 +220,7 @@ void BgPoEvent_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgPoEvent_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgPoEvent* this = THIS;
BgPoEvent* this = (BgPoEvent*)thisx;
if (this->type >= 2) {
Collider_DestroyTris(globalCtx, &this->collider);
@ -584,7 +582,7 @@ void BgPoEvent_PaintingBurn(BgPoEvent* this, GlobalContext* globalCtx) {
void BgPoEvent_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgPoEvent* this = THIS;
BgPoEvent* this = (BgPoEvent*)thisx;
this->actionFunc(this, globalCtx);
if ((this->actionFunc == BgPoEvent_AmyWait) || (this->actionFunc == BgPoEvent_PaintingPresent)) {
@ -598,7 +596,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
gPoSistersBethPaintingDL, gPoSistersAmyPaintingDL,
};
s32 pad;
BgPoEvent* this = THIS;
BgPoEvent* this = (BgPoEvent*)thisx;
u8 alpha;
Vec3f sp58;
Vec3f sp4C;

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((BgPoSyokudai*)thisx)
typedef enum {
POE_FLAME_PURPLE, // Meg
POE_FLAME_RED, // Joelle
@ -77,7 +75,7 @@ static InitChainEntry sInitChain[] = {
};
void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) {
BgPoSyokudai* this = THIS;
BgPoSyokudai* this = (BgPoSyokudai*)thisx;
s32 pad;
Actor_ProcessInitChain(thisx, sInitChain);
@ -122,7 +120,7 @@ void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgPoSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgPoSyokudai* this = THIS;
BgPoSyokudai* this = (BgPoSyokudai*)thisx;
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -133,7 +131,7 @@ void BgPoSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void BgPoSyokudai_Update(Actor* thisx, GlobalContext* globalCtx) {
BgPoSyokudai* this = THIS;
BgPoSyokudai* this = (BgPoSyokudai*)thisx;
s32 pad;
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
@ -145,7 +143,7 @@ void BgPoSyokudai_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgPoSyokudai* this = THIS;
BgPoSyokudai* this = (BgPoSyokudai*)thisx;
f32 lightBrightness;
u8 red;
u8 green;

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgPushbox*)thisx)
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx);
@ -41,7 +39,7 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) {
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
CollisionHeader* colHeader = NULL;
s32 pad2;
@ -54,7 +52,7 @@ void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -71,7 +69,7 @@ void BgPushbox_UpdateImpl(BgPushbox* this, GlobalContext* globalCtx) {
}
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
this->actionFunc(this, globalCtx);
func_8002DF90(&this->dyna);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgRelayObjects*)thisx)
typedef enum {
/* 0 */ WINDMILL_ROTATING_GEAR,
/* 1 */ WINDMILL_DAMPE_STONE_DOOR
@ -47,7 +45,7 @@ static InitChainEntry sInitChain[] = {
void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
static u32 D_808A9508 = 0;
BgRelayObjects* this = THIS;
BgRelayObjects* this = (BgRelayObjects*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -107,7 +105,7 @@ void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgRelayObjects_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgRelayObjects* this = THIS;
BgRelayObjects* this = (BgRelayObjects*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
if ((this->dyna.actor.params == WINDMILL_ROTATING_GEAR) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
@ -195,13 +193,13 @@ void func_808A939C(BgRelayObjects* this, GlobalContext* globalCtx) {
}
void BgRelayObjects_Update(Actor* thisx, GlobalContext* globalCtx) {
BgRelayObjects* this = THIS;
BgRelayObjects* this = (BgRelayObjects*)thisx;
this->actionFunc(this, globalCtx);
}
void BgRelayObjects_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgRelayObjects* this = THIS;
BgRelayObjects* this = (BgRelayObjects*)thisx;
if (this->dyna.actor.params == WINDMILL_ROTATING_GEAR) {
Gfx_DrawDListOpa(globalCtx, gWindmillRotatingPlatformDL);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((BgSpot00Break*)thisx)
void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot00Break_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot00Break_Update(Actor* thisx, GlobalContext* globalCtx);
@ -36,7 +34,7 @@ static InitChainEntry sInitChain[] = {
};
void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
BgSpot00Break* this = (BgSpot00Break*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -57,7 +55,7 @@ void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot00Break_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
BgSpot00Break* this = (BgSpot00Break*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -66,7 +64,7 @@ void BgSpot00Break_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot00Break_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
BgSpot00Break* this = (BgSpot00Break*)thisx;
if (this->dyna.actor.params == 1) {
Gfx_DrawDListOpa(globalCtx, gBarbedWireFenceDL);

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgSpot00Hanebasi*)thisx)
typedef enum {
/* -1 */ DT_DRAWBRIDGE = -1,
/* 0 */ DT_CHAIN_1,
@ -49,7 +47,7 @@ static InitChainEntry sInitChain[] = {
};
void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Hanebasi* this = THIS;
BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx;
s32 pad;
Vec3f chainPos;
CollisionHeader* colHeader = NULL;
@ -128,7 +126,7 @@ void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot00Hanebasi_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Hanebasi* this = THIS;
BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
@ -206,7 +204,7 @@ void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, GlobalContext* g
}
void BgSpot00Hanebasi_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Hanebasi* this = THIS;
BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx;
s32 pad;
this->actionFunc(this, globalCtx);

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

@ -8,8 +8,6 @@
#include "objects/object_spot01_objects/object_spot01_objects.h"
#define FLAGS 0x00000010
#define THIS ((BgSpot01Fusya*)thisx)
void BgSpot01Fusya_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Fusya_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx);
@ -41,7 +39,7 @@ void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, BgSpot01FusyaActionFunc acti
}
void BgSpot01Fusya_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Fusya* this = THIS;
BgSpot01Fusya* this = (BgSpot01Fusya*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->unk_154 = 100.0f;
@ -70,7 +68,7 @@ void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) {
}
void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Fusya* this = THIS;
BgSpot01Fusya* this = (BgSpot01Fusya*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((BgSpot01Idohashira*)thisx)
void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idohashira_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idohashira_Update(Actor* thisx, GlobalContext* globalCtx);
@ -141,7 +139,7 @@ void func_808AAF34(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
}
void BgSpot01Idohashira_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idohashira* this = THIS;
BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -283,7 +281,7 @@ void func_808AB570(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
}
void BgSpot01Idohashira_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idohashira* this = THIS;
BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx;
if (this->action < 0 || this->action >= 4 || sActionFuncs[this->action] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
@ -294,7 +292,7 @@ void BgSpot01Idohashira_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad[2];
BgSpot01Idohashira* this = THIS;
BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx;
CollisionHeader* colHeader;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -335,7 +333,7 @@ void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
}
void BgSpot01Idohashira_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idohashira* this = THIS;
BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx;
if (this->drawConfig < 0 || this->drawConfig > 0 || sDrawFuncs[this->drawConfig] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000020
#define THIS ((BgSpot01Idomizu*)thisx)
void BgSpot01Idomizu_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idomizu_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx);
@ -35,7 +33,7 @@ static InitChainEntry sInitChain[] = {
};
void BgSpot01Idomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idomizu* this = THIS;
BgSpot01Idomizu* this = (BgSpot01Idomizu*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
if (gSaveContext.eventChkInf[6] & 0x80 || LINK_AGE_IN_YEARS == YEARS_ADULT) {
@ -63,7 +61,7 @@ void func_808ABB84(BgSpot01Idomizu* this, GlobalContext* globalCtx) {
}
void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idomizu* this = THIS;
BgSpot01Idomizu* this = (BgSpot01Idomizu*)thisx;
this->actionFunc(this, globalCtx);
}

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

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((BgSpot01Idosoko*)thisx)
void BgSpot01Idosoko_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idosoko_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx);
@ -40,7 +38,7 @@ void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, BgSpot01IdosokoActionFun
void BgSpot01Idosoko_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgSpot01Idosoko* this = THIS;
BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx;
CollisionHeader* colHeader = NULL;
s32 pad2;
@ -56,7 +54,7 @@ void BgSpot01Idosoko_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot01Idosoko_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idosoko* this = THIS;
BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -65,7 +63,7 @@ void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
}
void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idosoko* this = THIS;
BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx;
this->actionFunc(this, globalCtx);
}

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