mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-02 01:24:52 +00:00
Code Issues Projects Releases Wiki Activity

More actor cleanup Part 2 (#116)

Browse source 
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
This commit is contained in:
Roman971 2020-05-04 21:02:51 +02:00 • committed by GitHub
parent 8efddb0fe0
commit f114df8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 3689 additions and 2523 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
src/code/z_en_a_keep.c
View file

@ -31,6 +31,13 @@ typedef struct {
#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);
void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8001D204(EnAObj* this, GlobalContext* globalCtx);
void func_8001D25C(EnAObj* this, GlobalContext* globalCtx);
void func_8001D360(EnAObj* this, GlobalContext* globalCtx);
@ -42,11 +49,6 @@ void func_8001D310(EnAObj* this, s16 params);
void func_8001D480(EnAObj* this, s16 params);
void func_8001D5C8(EnAObj* this, s16 params);
void EnAObj_Init(EnAObj* this, GlobalContext* globalCtx);
void EnAObj_Destroy(EnAObj* this, GlobalContext* globalCtx);
void EnAObj_Update(EnAObj* this, GlobalContext* globalCtx);
void EnAObj_Draw(EnAObj* this, GlobalContext* globalCtx);
const ActorInit En_A_Obj_InitVars = {
ACTOR_EN_A_OBJ,
ACTORTYPE_PROP,
@ -68,119 +70,118 @@ void EnAObj_SetupAction(EnAObj* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void EnAObj_Init(EnAObj* this, GlobalContext* globalCtx) {
u32 sp34;
void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
u32 sp34 = 0;
s32 pad;
EnAObj* this2 = this;
EnAObj* this = THIS;
f32 sp28;
sp34 = 0;
sp28 = 6.0f;
this->textId = (this->dyna.actor.params >> 8) & 0xFF;
this->dyna.actor.params &= 0xFF;
this->textId = (thisx->params >> 8) & 0xFF;
thisx->params &= 0xFF;
switch (this->dyna.actor.params) {
switch (thisx->params) {
case A_OBJ_BLOCK_SMALL:
Actor_SetScale(&this->dyna.actor, 0.025f);
Actor_SetScale(thisx, 0.025f);
break;
case A_OBJ_BLOCK_LARGE:
Actor_SetScale(&this->dyna.actor, 0.05f);
Actor_SetScale(thisx, 0.05f);
break;
case A_OBJ_BLOCK_HUGE:
case A_OBJ_CUBE_SMALL:
case A_OBJ_UNKNOWN_6:
Actor_SetScale(&this->dyna.actor, 0.1f);
Actor_SetScale(thisx, 0.1f);
break;
case A_OBJ_BLOCK_SMALL_ROT:
Actor_SetScale(&this->dyna.actor, 0.005f);
Actor_SetScale(thisx, 0.005f);
break;
case A_OBJ_BLOCK_LARGE_ROT:
default:
Actor_SetScale(&this->dyna.actor, 0.01f);
Actor_SetScale(thisx, 0.01f);
break;
}
if (this->dyna.actor.params >= 9) {
if (thisx->params >= 9) {
sp28 = 12.0f;
}
ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, sp28);
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, sp28);
this->dyna.actor.posRot2.pos = this->dyna.actor.posRot.pos;
thisx->posRot2.pos = thisx->posRot.pos;
this->dyna.dynaPolyId = -1;
this->dyna.unk_160 = 0;
this->dyna.unk_15C = 0;
this->dyna.actor.unk_FC = 1200.0f;
this->dyna.actor.unk_F8 = 200.0f;
thisx->unk_FC = 1200.0f;
thisx->unk_F8 = 200.0f;
switch (this->dyna.actor.params) {
switch (thisx->params) {
case A_OBJ_BLOCK_LARGE:
case A_OBJ_BLOCK_HUGE:
this2->dyna.dynaPolyId = 1;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, ACTORTYPE_BG);
func_8001D5C8(this2, this->dyna.actor.params);
this->dyna.dynaPolyId = 1;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, thisx, ACTORTYPE_BG);
func_8001D5C8(this, thisx->params);
break;
case A_OBJ_BLOCK_SMALL_ROT:
case A_OBJ_BLOCK_LARGE_ROT:
this2->dyna.dynaPolyId = 3;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, ACTORTYPE_BG);
func_8001D310(this2, this->dyna.actor.params);
this->dyna.dynaPolyId = 3;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, thisx, ACTORTYPE_BG);
func_8001D310(this, thisx->params);
break;
case A_OBJ_UNKNOWN_6:
// clang-format off
this->dyna.actor.flags |= 0x1; this2->dyna.dynaPolyId = 5; this2->unk_178 = 10.0f;
thisx->flags |= 0x1; this->dyna.dynaPolyId = 5; this->unk_178 = 10.0f;
// clang-format on
this->dyna.actor.gravity = -2.0f;
func_8001D234(this2, this->dyna.actor.params);
thisx->gravity = -2.0f;
func_8001D234(this, thisx->params);
break;
case A_OBJ_GRASS_CLUMP:
case A_OBJ_TREE_STUMP:
this2->dyna.dynaPolyId = 0;
func_8001D234(this2, this->dyna.actor.params);
this->dyna.dynaPolyId = 0;
func_8001D234(this, thisx->params);
break;
case A_OBJ_SIGNPOST_OBLONG:
case A_OBJ_SIGNPOST_ARROW:
this->dyna.actor.textId = (this2->textId & 0xFF) | 0x300;
thisx->textId = (this->textId & 0xFF) | 0x300;
// clang-format off
this->dyna.actor.flags |= 0x1 | 0x8; this->dyna.actor.unk_4C = 500.0f;
thisx->flags |= 0x1 | 0x8; thisx->unk_4C = 500.0f;
// clang-format on
this2->unk_178 = 45.0f;
func_8001D234(this2, this->dyna.actor.params);
Collider_InitCylinder(globalCtx, &this2->collider);
Collider_SetCylinder(globalCtx, &this2->collider, &this->dyna.actor, &D_80115440);
this->dyna.actor.colChkInfo.mass = 0xFF;
this->dyna.actor.unk_1F = 0;
this->unk_178 = 45.0f;
func_8001D234(this, thisx->params);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, thisx, &D_80115440);
thisx->colChkInfo.mass = 0xFF;
thisx->unk_1F = 0;
break;
case A_OBJ_KNOB:
this->dyna.actor.gravity = -1.5f;
func_8001D480(this2, this->dyna.actor.params);
thisx->gravity = -1.5f;
func_8001D480(this, thisx->params);
break;
default:
this->dyna.actor.gravity = -2.0f;
func_8001D234(this2, this->dyna.actor.params);
thisx->gravity = -2.0f;
func_8001D234(this, thisx->params);
break;
}
if (this->dyna.actor.params < 5) {
this->dyna.actor.colChkInfo.mass = 0xFF;
if (thisx->params < 5) {
thisx->colChkInfo.mass = 0xFF;
}
if (this->dyna.dynaPolyId != -1) {
DynaPolyInfo_Alloc(D_8011546C[this->dyna.dynaPolyId], &sp34);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, sp34);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, sp34);
}
}
void EnAObj_Destroy(EnAObj* this, GlobalContext* globalCtx) {
ColliderCylinder* collider = &this->collider;
void EnAObj_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnAObj* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
switch (this->dyna.actor.params) {
case A_OBJ_SIGNPOST_OBLONG:
case A_OBJ_SIGNPOST_ARROW:
Collider_DestroyCylinder(globalCtx, collider);
Collider_DestroyCylinder(globalCtx, &this->collider);
}
}
@ -308,8 +309,8 @@ void func_8001D608(EnAObj* this, GlobalContext* globalCtx) {
this->dyna.unk_150 = 0.0f;
}
void EnAObj_Update(EnAObj* this, GlobalContext* globalCtx) {
Collider* collider;
void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx) {
EnAObj* this = THIS;
this->actionFunc(this, globalCtx);
Actor_MoveForward(&this->dyna.actor);
@ -328,14 +329,13 @@ void EnAObj_Update(EnAObj* this, GlobalContext* globalCtx) {
switch (this->dyna.actor.params) {
case A_OBJ_SIGNPOST_OBLONG:
case A_OBJ_SIGNPOST_ARROW:
collider = (Collider*)&this->collider;
Collider_CylinderUpdate(&this->dyna.actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
}
}
void EnAObj_Draw(EnAObj* this, GlobalContext* globalCtx) {
s32 type = this->dyna.actor.params;
void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 type = thisx->params;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
@ -347,7 +347,7 @@ void EnAObj_Draw(EnAObj* this, GlobalContext* globalCtx) {
type = A_OBJ_KNOB;
}
if (this->dyna.actor.params == A_OBJ_KNOB) {
if (thisx->params == A_OBJ_KNOB) {
gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 1, 0x3C, 0x3C, 0x3C, 0x32);
}

29
src/code/z_en_item00.c
View file

@ -45,10 +45,12 @@ typedef struct {
#define FLAGS 0x00000000
void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx);
void EnItem00_Destroy(EnItem00* this, GlobalContext* globalCtx);
void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx);
void EnItem00_Draw(EnItem00* this, GlobalContext* globalCtx);
#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);
void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx);
void func_8001E1C8(EnItem00* this, GlobalContext* globalCtx);
@ -85,8 +87,8 @@ void EnItem00_SetupAction(EnItem00* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
s32 pad1;
void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
s32 pad2;
f32 sp34;
f32 sp30;
@ -312,9 +314,10 @@ void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
}
void EnItem00_Destroy(EnItem00* this, GlobalContext* globalCtx) {
ColliderCylinder* collider = &this->collider;
Collider_DestroyCylinder(globalCtx, collider);
void EnItem00_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
@ -480,8 +483,8 @@ extern s32 D_80157D90;
extern u32 D_80157D90_; // these must be defined separately for EnItem00_Update to match
extern s16 D_80157D94;
void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
s32 pad;
void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
s16* params;
s32 getItemId;
s16 sp3A;
@ -700,8 +703,8 @@ void func_8001F080(EnItem00* this, GlobalContext* globalCtx);
void func_8001F1F4(EnItem00* this, GlobalContext* globalCtx);
void func_8001F334(EnItem00* this, GlobalContext* globalCtx);
void EnItem00_Draw(EnItem00* this, GlobalContext* globalCtx) {
s32 pad;
void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS;
f32 unkFloat;
if (!(this->unk_156 & this->unk_158)) {

40
src/code/z_player_call.c
View file

@ -1,19 +1,19 @@
#include <global.h>
void (*sPlayerCallInitFunc)(void*, GlobalContext*);
void (*sPlayerCallDestroyFunc)(void*, GlobalContext*);
void (*sPlayerCallUpdateFunc)(void*, GlobalContext*);
void (*sPlayerCallDrawFunc)(void*, GlobalContext*);
void (*sPlayerCallInitFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallDestroyFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallUpdateFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallDrawFunc)(Actor* thisx, GlobalContext* globalCtx);
void func_80846CD8(Player*, GlobalContext*);
void func_8084AB54(Player*, GlobalContext*);
void func_80849EA8(Player*, GlobalContext*);
void func_8084A5C4(Player*, GlobalContext*);
void func_80846CD8(Actor* thisx, GlobalContext* globalCtx);
void func_8084AB54(Actor* thisx, GlobalContext* globalCtx);
void func_80849EA8(Actor* thisx, GlobalContext* globalCtx);
void func_8084A5C4(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Init(Player* player, GlobalContext* globalCtx);
void PlayerCall_Destroy(Player* player, GlobalContext* globalCtx);
void PlayerCall_Update(Player* player, GlobalContext* globalCtx);
void PlayerCall_Draw(Player* player, GlobalContext* globalCtx);
void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Update(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Player_InitVars = {
ACTOR_PLAYER,
@ -34,23 +34,23 @@ void PlayerCall_InitFuncPtrs() {
sPlayerCallDrawFunc = KaleidoManager_GetRamAddr(func_8084A5C4);
}
void PlayerCall_Init(Player* player, GlobalContext* globalCtx) {
void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx) {
KaleidoScopeCall_LoadPlayer();
PlayerCall_InitFuncPtrs();
sPlayerCallInitFunc(player, globalCtx);
sPlayerCallInitFunc(thisx, globalCtx);
}
void PlayerCall_Destroy(Player* player, GlobalContext* globalCtx) {
void PlayerCall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
KaleidoScopeCall_LoadPlayer();
sPlayerCallDestroyFunc(player, globalCtx);
sPlayerCallDestroyFunc(thisx, globalCtx);
}
void PlayerCall_Update(Player* player, GlobalContext* globalCtx) {
void PlayerCall_Update(Actor* thisx, GlobalContext* globalCtx) {
KaleidoScopeCall_LoadPlayer();
sPlayerCallUpdateFunc(player, globalCtx);
sPlayerCallUpdateFunc(thisx, globalCtx);
}
void PlayerCall_Draw(Player* player, GlobalContext* globalCtx) {
void PlayerCall_Draw(Actor* thisx, GlobalContext* globalCtx) {
KaleidoScopeCall_LoadPlayer();
sPlayerCallDrawFunc(player, globalCtx);
sPlayerCallDrawFunc(thisx, globalCtx);
}

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

@ -2,10 +2,13 @@
#define FLAGS 0x00000030
void ArmsHook_Init(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Destroy(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Update(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Draw(ArmsHook* this, GlobalContext* globalCtx);
#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);
void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx);
void ArmsHook_SetupAction(ArmsHook* this, ActorFunc actionFunc);
void func_80864FC4(ArmsHook* this, GlobalContext* globalCtx);

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

@ -10,10 +10,12 @@
#define FLAGS 0x02000010
void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx);
void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx);
void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx);
void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx);
#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);
void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx);
void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx);
void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx);
@ -41,7 +43,9 @@ void ArrowFire_SetupAction(ArrowFire* this, ActorFunc* actionFunc) {
this->actionFunc = actionFunc;
}
void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx) {
void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
Actor_ProcessInitChain(&this->actor, initChain);
this->radius = 0;
this->unk_158 = 1.0f;
@ -52,7 +56,7 @@ void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx) {
this->unk_15C = 0.0f;
}
void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx) {
void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
// Translates to: "Disappearance"
LOG_STRING("消滅", "../z_arrow_fire.c", 421);
@ -177,7 +181,9 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) {
}
}
void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx) {
void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) {
Actor_Kill(&this->actor);
} else {
@ -185,9 +191,9 @@ void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx) {
}
}
void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
s32 pad;
u32 stateFrames;
GraphicsContext* gfxCtx;
Actor* tranform;

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

@ -10,10 +10,12 @@
#define FLAGS 0x02000010
void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx);
void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx);
void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx);
void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx);
#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);
void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx);
void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx);
void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx);
@ -41,7 +43,9 @@ void ArrowIce_SetupAction(ArrowIce* this, ActorFunc* actionFunc) {
this->actionFunc = actionFunc;
}
void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx) {
void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
Actor_ProcessInitChain(&this->actor, initChain);
this->radius = 0;
this->unk_160 = 1.0f;
@ -52,7 +56,7 @@ void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx) {
this->unk_164 = 0.0f;
}
void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx) {
void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
// Translates to: "Disappearance"
LOG_STRING("消滅", "../z_arrow_ice.c", 415);
@ -177,7 +181,9 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) {
}
}
void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx) {
void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) {
Actor_Kill(&this->actor);
} else {
@ -185,9 +191,9 @@ void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx) {
}
}
void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowIce* this = THIS;
s32 pad;
Actor* tranform;
u32 stateFrames;
GraphicsContext* gfxCtx;

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

@ -10,10 +10,12 @@
#define FLAGS 0x02000010
void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx);
#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);
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx);
@ -41,7 +43,9 @@ void ArrowLight_SetupAction(ArrowLight* this, ActorFunc* actionFunc) {
this->actionFunc = actionFunc;
}
void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
Actor_ProcessInitChain(&this->actor, initChain);
this->radius = 0;
this->unk_160 = 1.0f;
@ -52,7 +56,7 @@ void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) {
this->unk_164 = 0.0f;
}
void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
// Translates to: "Disappearance"
LOG_STRING("消滅", "../z_arrow_light.c", 403);
@ -177,7 +181,9 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) {
}
}
void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) {
Actor_Kill(&this->actor);
} else {
@ -185,9 +191,9 @@ void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx) {
}
}
void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
s32 pad;
u32 stateFrames;
GraphicsContext* gfxCtx;
Actor* tranform;

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx);
void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx);
void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx);
void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx);
#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);
void BgBdanObjects_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx);
void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx);
@ -94,9 +96,9 @@ void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) {
}
}
void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
s16 pad;
void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
s32 pad;
s32 localC = 0;
Actor_ProcessInitChain(this, initChain);
@ -152,8 +154,8 @@ void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) {
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, this, localC);
}
void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
void BgBdanObjects_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
if (thisx->params == 0) {
@ -428,23 +430,27 @@ void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) {
}
}
void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx) {
Actor_SetHeight(&this->dyna.actor, 50.0f);
void BgBdanObjects_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
Actor_SetHeight(thisx, 50.0f);
this->actionFunc(this, globalCtx);
}
void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx) {
if (this->dyna.actor.params == 0) {
void BgBdanObjects_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBdanObjects* this = THIS;
if (thisx->params == 0) {
if (this->actionFunc == (ActorFunc)func_8086C054) {
if (((this->dyna.actor.initPosRot.pos.y + -79.0f) - 5.0f) < this->dyna.actor.posRot.pos.y) {
if (((thisx->initPosRot.pos.y + -79.0f) - 5.0f) < thisx->posRot.pos.y) {
Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
}
}
}
if (this->dyna.actor.params == 2) {
if (thisx->params == 2) {
Gfx_DrawDListXlu(globalCtx, &D_060038E8);
} else {
Gfx_DrawDListOpa(globalCtx, D_8086CDA0[this->dyna.actor.params]);
Gfx_DrawDListOpa(globalCtx, D_8086CDA0[thisx->params]);
}
}

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx);
void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx);
void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx);
void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx);
#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);
void BgBdanSwitch_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8086D5C4(BgBdanSwitch* this);
void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx);
@ -122,8 +124,9 @@ void func_8086D0EC(BgBdanSwitch* this) {
this->actor.shape.unk_08 = 1.2f / this->unk_1D0;
}
void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgBdanSwitch_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
s32 pad;
s16 type;
s32 flag;
@ -186,7 +189,9 @@ void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) {
osSyncPrintf("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", this->actor.params);
}
void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) {
void BgBdanSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
switch (this->actor.params & 0xFF) {
case BLUE:
case YELLOW_HEAVY:
@ -202,6 +207,7 @@ void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) {
void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) {
s32 pad;
s32 type;
if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) {
type = this->actor.params & 0xFF;
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
@ -458,10 +464,10 @@ void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) {
}
}
void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) {
s32 pad;
void BgBdanSwitch_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
s32 type;
s32 pad2;
s32 temp;
if (this->unk_1DA > 0) {
this->unk_1DA -= 1;
@ -476,9 +482,9 @@ void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) {
if (!func_8008E988(globalCtx) && this->unk_1D8 > 0) {
this->unk_1D8 -= 1;
}
pad = this->collider.base.acFlags;
temp = this->collider.base.acFlags;
this->collider.base.acFlags &= 0xFFFD;
this->unk_1DC = pad;
this->unk_1DC = temp;
this->collider.list[0].dim.modelSphere.radius = this->unk_1D4 * 370.0f;
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
@ -491,7 +497,9 @@ void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2)
Gfx_DrawDListOpa(globalCtx, arg2);
}
void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) {
void BgBdanSwitch_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBdanSwitch* this = THIS;
switch (this->actor.params & 0xFF) {
case YELLOW_HEAVY:
case YELLOW:

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

@ -12,9 +12,11 @@
#define FLAGS 0x00000010
void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx);
void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx);
void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx);
#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);
void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx);
@ -36,12 +38,12 @@ void BgBomGuard_SetupAction(BgBomGuard* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) {
void BgBomGuard_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
s32 pad[2];
Actor* thisx = &this->dyna.actor;
s32 local_c = 0;
DynaPolyInfo_SetActorMove(&this->dyna.actor, 0);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
DynaPolyInfo_Alloc(&D_06001C40, &local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c);
@ -55,7 +57,9 @@ void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) {
BgBomGuard_SetupAction(this, func_8086E638);
}
void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx) {
void BgBomGuard_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -83,6 +87,8 @@ void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) {
}
}
void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx) {
void BgBomGuard_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBomGuard* this = THIS;
this->actionFunc(this, globalCtx);
}

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

@ -8,10 +8,13 @@
#define FLAGS 0x00400000
void BgBombwall_Init(BgBombwall* this, GlobalContext* globalCtx);
void BgBombwall_Destroy(BgBombwall* this, GlobalContext* globalCtx);
void BgBombwall_Update(BgBombwall* this, GlobalContext* globalCtx);
void BgBombwall_Draw(BgBombwall* this, GlobalContext* globalCtx);
#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);
void BgBombwall_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8086E7D0(BgBombwall* this, GlobalContext* globalCtx);
void func_8086EAC0(BgBombwall* this, GlobalContext* globalCtx);
void func_8086EB5C(BgBombwall* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgBowlWall_Init(BgBowlWall* this, GlobalContext* globalCtx);
void BgBowlWall_Destroy(BgBowlWall* this, GlobalContext* globalCtx);
void BgBowlWall_Update(BgBowlWall* this, GlobalContext* globalCtx);
void BgBowlWall_Draw(BgBowlWall* this, GlobalContext* globalCtx);
#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);
void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8086F260(BgBowlWall* this, GlobalContext* globalCtx);
void func_8086F440(BgBowlWall* this, GlobalContext* globalCtx);
void func_8086F464(BgBowlWall* this, GlobalContext* globalCtx);

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

@ -8,9 +8,12 @@
#define FLAGS 0x00000010
void BgBreakwall_Init(BgBreakwall* this, GlobalContext* globalCtx);
void BgBreakwall_Destroy(BgBreakwall* this, GlobalContext* globalCtx);
void BgBreakwall_Update(BgBreakwall* this, GlobalContext* globalCtx);
#define THIS ((BgBreakwall*)thisx)
void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx);
void BgBreakwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx);
void BgBreakwall_SetupAction(BgBreakwall* this, ActorFunc actionFunc);
void func_80870290(BgBreakwall* this, GlobalContext* globalCtx);
void func_80870394(BgBreakwall* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgDdanJd_Init(BgDdanJd* this, GlobalContext* globalCtx);
void BgDdanJd_Destroy(BgDdanJd* this, GlobalContext* globalCtx);
void BgDdanJd_Update(BgDdanJd* this, GlobalContext* globalCtx);
void BgDdanJd_Draw(BgDdanJd* this, GlobalContext* globalCtx);
#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);
void BgDdanJd_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80870B88(BgDdanJd* this, GlobalContext* globalCtx);
void func_80870D2C(BgDdanJd* this, GlobalContext* globalCtx);
void func_80870F00(BgDdanJd* this, GlobalContext* globalCtx);

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

@ -8,11 +8,13 @@
#define FLAGS 0x00000010
void BgDdanKd_Init(BgDdanKd* this, GlobalContext* globalCtx);
void BgDdanKd_Destroy(BgDdanKd* this, GlobalContext* globalCtx);
void BgDdanKd_Update(BgDdanKd* this, GlobalContext* globalCtx);
void BgDdanKd_Draw(BgDdanKd* this, GlobalContext* globalCtx);
void BgDdanKd_SetupAction(BgDdanKd* this, ActorFunc actionFunc);
#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);
void BgDdanKd_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgDdanKd_CheckForExplosions(BgDdanKd* this, GlobalContext* globalCtx);
void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx);
void func_80871838(BgDdanKd* this, GlobalContext* globalCtx);
@ -53,9 +55,9 @@ void BgDdanKd_SetupAction(BgDdanKd* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgDdanKd_Init(BgDdanKd* this, GlobalContext* globalCtx) {
void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
s32 pad;
s32 pad2;
s32 sp24 = 0;
this->previousCollidingExplosion = NULL;
@ -76,7 +78,9 @@ void BgDdanKd_Init(BgDdanKd* this, GlobalContext* globalCtx) {
}
}
void BgDdanKd_Destroy(BgDdanKd* this, GlobalContext* globalCtx) {
void BgDdanKd_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -164,10 +168,12 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) {
void func_80871838(BgDdanKd* this, GlobalContext* globalCtx) {
}
void BgDdanKd_Update(BgDdanKd* this, GlobalContext* globalCtx) {
void BgDdanKd_Update(Actor* thisx, GlobalContext* globalCtx) {
BgDdanKd* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgDdanKd_Draw(BgDdanKd* this, GlobalContext* globalCtx) {
void BgDdanKd_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_060048A8);
}

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgDodoago_Init(BgDodoago* this, GlobalContext* globalCtx);
void BgDodoago_Destroy(BgDodoago* this, GlobalContext* globalCtx);
void BgDodoago_Update(BgDodoago* this, GlobalContext* globalCtx);
void BgDodoago_Draw(BgDodoago* this, GlobalContext* globalCtx);
#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);
void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgDodoago_SetupAction(BgDodoago* this, ActorFunc actionFunc);
// void func_80871A08(Vec3f* vec, GlobalContext* globalCtx); // Not 100% sure
void func_80871CF4(BgDodoago* this, GlobalContext* globalCtx);

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

@ -8,9 +8,12 @@
#define FLAGS 0x02000030
void BgDyYoseizo_Init(BgDyYoseizo* this, GlobalContext* globalCtx);
void BgDyYoseizo_Destroy(BgDyYoseizo* this, GlobalContext* globalCtx);
void BgDyYoseizo_Update(BgDyYoseizo* this, GlobalContext* globalCtx);
#define THIS ((BgDyYoseizo*)thisx)
void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx);
void BgDyYoseizo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx);
void func_80872960(BgDyYoseizo* this, GlobalContext* globalCtx, s16 arg2);
void func_80872C58(BgDyYoseizo* this, GlobalContext* globalCtx);
void func_80872D20(BgDyYoseizo* this, GlobalContext* globalCtx);
@ -34,6 +37,7 @@ void func_80874BE0(BgDyYoseizo* this, GlobalContext* globalCtx);
// func_80874D9C
void func_80874EAC(BgDyYoseizo* this, GlobalContext* globalCtx);
void func_808751A0(BgDyYoseizo* this, GlobalContext* globalCtx);
/*
const ActorInit Bg_Dy_Yoseizo_InitVars = {
ACTOR_BG_DY_YOSEIZO,

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgGanonOtyuka_Init(BgGanonOtyuka* this, GlobalContext* globalCtx);
void BgGanonOtyuka_Destroy(BgGanonOtyuka* this, GlobalContext* globalCtx);
void BgGanonOtyuka_Update(BgGanonOtyuka* this, GlobalContext* globalCtx);
void BgGanonOtyuka_Draw(BgGanonOtyuka* this, GlobalContext* globalCtx);
#define THIS ((BgGanonOtyuka*)thisx)
void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGanonOtyuka_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGanonOtyuka_Update(Actor* thisx, GlobalContext* globalCtx);
void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx);
void func_80875C88(BgGanonOtyuka* this, GlobalContext* globalCtx);
void func_808760DC(BgGanonOtyuka* this, GlobalContext* globalCtx);

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

@ -10,10 +10,12 @@
#define FLAGS 0x00000000
void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx);
void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx);
void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx);
void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx);
#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);
void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx);
void func_80878300(BgGateShutter* this, GlobalContext* globalCtx);
@ -35,12 +37,12 @@ const ActorInit Bg_Gate_Shutter_InitVars = {
extern UNK_TYPE D_06001CD0;
extern UNK_TYPE D_06001DA8;
void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) {
void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
s32 pad[2];
Actor* thisx = &this->dyna.actor;
s32 local_c = 0;
DynaPolyInfo_SetActorMove(thisx, 0);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
DynaPolyInfo_Alloc(&D_06001DA8, &local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c);
this->somePosX = thisx->posRot.pos.x;
@ -60,7 +62,9 @@ void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) {
this->actionFunc = (ActorFunc)func_8087828C;
}
void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) {
void BgGateShutter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -115,14 +119,16 @@ void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) {
}
}
void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx) {
void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGateShutter* this = THIS;
if (this->unk_178 != 0) {
this->unk_178 -= 1;
}
this->actionFunc(this, globalCtx);
}
void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) {
void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx);
void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx);
void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx);
void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx);
#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);
void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx);
void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx);
void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx);
@ -37,31 +40,31 @@ extern UNK_TYPE D_06000600;
extern UNK_TYPE D_06000DB8;
extern UNK_TYPE D_02002640;
void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx) {
void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
s32 pad;
DynaCollisionContext* dynaCollisionContext;
s32 local_c;
local_c = 0;
Actor_ProcessInitChain(&this->dyna, &initChain);
DynaPolyInfo_SetActorMove(this, 0);
Actor_ProcessInitChain(thisx, &initChain);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
DynaPolyInfo_Alloc(&D_06000DB8, &local_c);
dynaCollisionContext = &globalCtx->colCtx.dyna;
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, dynaCollisionContext, this, local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c);
if (gSaveContext.eventChkInf[4] & 0x2000) {
this->actionFunc = func_808787A4;
} else {
this->dyna.actor.draw = NULL;
func_8003EBF8(globalCtx, dynaCollisionContext, this->dyna.dynaPolyId);
func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
this->actionFunc = BgGjyoBridge_TriggerCutscene;
}
}
void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx) {
void BgGjyoBridge_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -85,18 +88,20 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx)
void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.actorActions[2] != NULL) &&
(globalCtx->csCtx.actorActions[2]->action == 2)) {
this->dyna.actor.draw = &BgGjyoBridge_Draw;
this->dyna.actor.draw = BgGjyoBridge_Draw;
func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
gSaveContext.eventChkInf[4] |= 0x2000;
}
}
void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx) {
void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) {
s32 pad;
void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = THIS;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];

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

@ -8,10 +8,13 @@
#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);
void func_80878C30(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void BgGndDarkmeiro_Init(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void BgGndDarkmeiro_Destroy(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void BgGndDarkmeiro_Update(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void func_80878F28(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void func_80878F34(BgGndDarkmeiro* this, GlobalContext* globalCtx);
void func_80879128(BgGndDarkmeiro* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgGndFiremeiro_Init(BgGndFiremeiro* this, GlobalContext* globalCtx);
void BgGndFiremeiro_Destroy(BgGndFiremeiro* this, GlobalContext* globalCtx);
void BgGndFiremeiro_Update(BgGndFiremeiro* this, GlobalContext* globalCtx);
void BgGndFiremeiro_Draw(BgGndFiremeiro* this, GlobalContext* globalCtx);
#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);
void BgGndFiremeiro_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808795AC(BgGndFiremeiro* this, GlobalContext* globalCtx);
void func_80879668(BgGndFiremeiro* this, GlobalContext* globalCtx);
void func_80879808(BgGndFiremeiro* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgGndIceblock_Init(BgGndIceblock* this, GlobalContext* globalCtx);
void BgGndIceblock_Destroy(BgGndIceblock* this, GlobalContext* globalCtx);
void BgGndIceblock_Update(BgGndIceblock* this, GlobalContext* globalCtx);
void BgGndIceblock_Draw(BgGndIceblock* this, GlobalContext* globalCtx);
#define THIS ((BgGndIceblock*)thisx)
void BgGndIceblock_Init(Actor* thisx, GlobalContext* globalCtx);
void BgGndIceblock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgGndIceblock_Update(Actor* thisx, GlobalContext* globalCtx);
void BgGndIceblock_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087A0C8(BgGndIceblock* this, GlobalContext* globalCtx);
void func_8087A184(BgGndIceblock* this, GlobalContext* globalCtx);
void func_8087A248(BgGndIceblock* this, GlobalContext* globalCtx);

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgGndNisekabe_Init(BgGndNisekabe* this, GlobalContext* globalCtx);
void BgGndNisekabe_Destroy(BgGndNisekabe* this, GlobalContext* globalCtx);
void BgGndNisekabe_Update(BgGndNisekabe* this, GlobalContext* globalCtx);
void BgGndNisekabe_Draw(BgGndNisekabe* this, GlobalContext* globalCtx);
#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);
void BgGndNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Gnd_Nisekabe_InitVars = {
ACTOR_BG_GND_NISEKABE,
@ -27,15 +29,19 @@ const ActorInit Bg_Gnd_Nisekabe_InitVars = {
static u32 segmentAddr[] = { 0x06009230, 0x0600A390, 0x0600B4A0 };
void BgGndNisekabe_Init(BgGndNisekabe* this, GlobalContext* globalCtx) {
void BgGndNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
Actor_SetScale(&this->actor, 0.1);
this->actor.unk_F4 = 3000.0;
}
void BgGndNisekabe_Destroy(BgGndNisekabe* this, GlobalContext* globalCtx) {
void BgGndNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndNisekabe_Update(BgGndNisekabe* this, GlobalContext* globalCtx) {
void BgGndNisekabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
if (globalCtx->actorCtx.unk_03 != 0) {
this->actor.flags |= 0x80;
} else {
@ -43,7 +49,8 @@ void BgGndNisekabe_Update(BgGndNisekabe* this, GlobalContext* globalCtx) {
}
}
void BgGndNisekabe_Draw(BgGndNisekabe* this, GlobalContext* globalCtx) {
void BgGndNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
u32 index = this->actor.params & 0xFF;
if ((this->actor.flags & 0x80) == 0x80) {

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgGndSoulmeiro_Init(BgGndSoulmeiro* this, GlobalContext* globalCtx);
void BgGndSoulmeiro_Destroy(BgGndSoulmeiro* this, GlobalContext* globalCtx);
void BgGndSoulmeiro_Update(BgGndSoulmeiro* this, GlobalContext* globalCtx);
void BgGndSoulmeiro_Draw(BgGndSoulmeiro* this, GlobalContext* globalCtx);
#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);
void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087AF38(BgGndSoulmeiro* this, GlobalContext* globalCtx);
void func_8087B284(BgGndSoulmeiro* this, GlobalContext* globalCtx);
void func_8087B350(BgGndSoulmeiro* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgHaka_Init(BgHaka* this, GlobalContext* globalCtx);
void BgHaka_Destroy(BgHaka* this, GlobalContext* globalCtx);
void BgHaka_Update(BgHaka* this, GlobalContext* globalCtx);
void BgHaka_Draw(BgHaka* this, GlobalContext* globalCtx);
#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);
void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087B758(BgHaka* this, Player* player);
void func_8087B7E8(BgHaka* this, GlobalContext* globalCtx);
void func_8087B938(BgHaka* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgHakaGate_Init(BgHakaGate* this, GlobalContext* globalCtx);
void BgHakaGate_Destroy(BgHakaGate* this, GlobalContext* globalCtx);
void BgHakaGate_Update(BgHakaGate* this, GlobalContext* globalCtx);
void BgHakaGate_Draw(BgHakaGate* this, GlobalContext* globalCtx);
#define THIS ((BgHakaGate*)thisx)
void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaGate_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaGate_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087C114(BgHakaGate* this, GlobalContext* globalCtx);
void func_8087C120(BgHakaGate* this, GlobalContext* globalCtx);
void func_8087C158(BgHakaGate* this, GlobalContext* globalCtx);

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

@ -2,10 +2,13 @@
#define FLAGS 0x00000010
void BgHakaHuta_Init(BgHakaHuta* this, GlobalContext* globalCtx);
void BgHakaHuta_Destroy(BgHakaHuta* this, GlobalContext* globalCtx);
void BgHakaHuta_Update(BgHakaHuta* this, GlobalContext* globalCtx);
void BgHakaHuta_Draw(BgHakaHuta* this, GlobalContext* globalCtx);
#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);
void BgHakaHuta_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087D0AC(BgHakaHuta* this, GlobalContext* globalCtx);
// void func_8087D268(BgHakaHuta* this, GlobalContext* globalCtx, u16 arg2); not sure about this one
// void func_8087D5B8(BgHakaHuta* this, GlobalContext* globalCtx); not sure about this one

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

@ -8,14 +8,16 @@
#define FLAGS 0x000000B0
void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx);
void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx);
void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx);
#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);
void BgHakaMegane_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx);
void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx);
void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx);
void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx);
const ActorInit Bg_Haka_Megane_InitVars = {
ACTOR_BG_HAKA_MEGANE,
@ -45,11 +47,11 @@ static UNK_TYPE dlists[] = {
extern UNK_TYPE D_06001250;
void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_SetActorMove(thisx, 0);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
if (thisx->params < 3) {
this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HAKACH_OBJECTS);
@ -64,7 +66,9 @@ void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) {
}
}
void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) {
void BgHakaMegane_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -74,7 +78,7 @@ void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
this->dyna.actor.objBankIndex = this->objBankIndex;
this->dyna.actor.draw = (ActorFunc)func_8087DC94;
this->dyna.actor.draw = BgHakaMegane_Draw;
Actor_SetObjectDependency(globalCtx, &this->dyna.actor);
if (globalCtx->roomCtx.curRoom.showInvisActors) {
this->actionFunc = (ActorFunc)func_8087DBF0;
@ -104,12 +108,14 @@ void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) {
void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) {
}
void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) {
void BgHakaMegane_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
this->actionFunc(this, globalCtx);
}
void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
void BgHakaMegane_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaMegane* this = THIS;
if ((thisx->flags & 0x80) == 0x80) {
Gfx_DrawDListXlu(globalCtx, dlists[thisx->params]);

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

@ -2,10 +2,13 @@
#define FLAGS 0x00000000
void BgHakaMeganeBG_Init(BgHakaMeganeBG* this, GlobalContext* globalCtx);
void BgHakaMeganeBG_Destroy(BgHakaMeganeBG* this, GlobalContext* globalCtx);
void BgHakaMeganeBG_Update(BgHakaMeganeBG* this, GlobalContext* globalCtx);
void BgHakaMeganeBG_Draw(BgHakaMeganeBG* this, GlobalContext* globalCtx);
#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);
void BgHakaMeganeBG_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087E258(BgHakaMeganeBG* this, GlobalContext* globalCtx);
void func_8087E288(BgHakaMeganeBG* this, GlobalContext* globalCtx);
void func_8087E2D8(BgHakaMeganeBG* this, GlobalContext* globalCtx);

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

@ -8,9 +8,12 @@
#define FLAGS 0x00000011
void BgHakaSgami_Init(BgHakaSgami* this, GlobalContext* globalCtx);
void BgHakaSgami_Destroy(BgHakaSgami* this, GlobalContext* globalCtx);
void BgHakaSgami_Update(BgHakaSgami* this, GlobalContext* globalCtx);
#define THIS ((BgHakaSgami*)thisx)
void BgHakaSgami_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHakaSgami_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHakaSgami_Update(Actor* thisx, GlobalContext* globalCtx);
void func_8087E7E4(BgHakaSgami* this, GlobalContext* globalCtx);
void func_8087E858(BgHakaSgami* this, GlobalContext* globalCtx);
void func_8087EDC0(BgHakaSgami* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgHakaShip_Init(BgHakaShip* this, GlobalContext* globalCtx);
void BgHakaShip_Destroy(BgHakaShip* this, GlobalContext* globalCtx);
void BgHakaShip_Update(BgHakaShip* this, GlobalContext* globalCtx);
void BgHakaShip_Draw(BgHakaShip* this, GlobalContext* globalCtx);
#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);
void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087F27C(BgHakaShip* this, GlobalContext* globalCtx);
void func_8087F2D8(BgHakaShip* this, GlobalContext* globalCtx);
void func_8087F364(BgHakaShip* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgHakaTrap_Init(BgHakaTrap* this, GlobalContext* globalCtx);
void BgHakaTrap_Destroy(BgHakaTrap* this, GlobalContext* globalCtx);
void BgHakaTrap_Update(BgHakaTrap* this, GlobalContext* globalCtx);
void BgHakaTrap_Draw(BgHakaTrap* this, GlobalContext* globalCtx);
#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);
void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8087FFC0(BgHakaTrap* this, GlobalContext* globalCtx);
void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx);
void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000010
void BgHakaTubo_Init(BgHakaTubo* this, GlobalContext* globalCtx);
void BgHakaTubo_Destroy(BgHakaTubo* this, GlobalContext* globalCtx);
void BgHakaTubo_Update(BgHakaTubo* this, GlobalContext* globalCtx);
void BgHakaTubo_Draw(BgHakaTubo* this, GlobalContext* globalCtx);
#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);
void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808813A0(BgHakaTubo* this, GlobalContext* globalCtx);
void func_80881608(BgHakaTubo* this, GlobalContext* globalCtx);
void func_80881904(BgHakaTubo* this, GlobalContext* globalCtx);

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000030
void BgHakaWater_Init(BgHakaWater* this, GlobalContext* globalCtx);
void BgHakaWater_Destroy(BgHakaWater* this, GlobalContext* globalCtx);
void BgHakaWater_Update(BgHakaWater* this, GlobalContext* globalCtx);
void BgHakaWater_Draw(BgHakaWater* this, GlobalContext* globalCtx);
#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);
void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx);
// ? func_80881D94(BgHakaWater* this, GlobalContext* globalCtx) // not entirely sure on this one
void func_80881EDC(BgHakaWater* this, GlobalContext* globalCtx);
void func_80881F98(BgHakaWater* this, GlobalContext* globalCtx);

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

@ -8,9 +8,11 @@
#define FLAGS 0x00000010
void BgHakaZou_Init(BgHakaZou* this, GlobalContext* globalCtx);
void BgHakaZou_Destroy(BgHakaZou* this, GlobalContext* globalCtx);
void BgHakaZou_Update(BgHakaZou* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Haka_Zou_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHeavyBlock_Init(BgHeavyBlock* this, GlobalContext* globalCtx);
void BgHeavyBlock_Destroy(BgHeavyBlock* this, GlobalContext* globalCtx);
void BgHeavyBlock_Update(BgHeavyBlock* this, GlobalContext* globalCtx);
void BgHeavyBlock_Draw(BgHeavyBlock* this, GlobalContext* globalCtx);
#define THIS ((BgHeavyBlock*)thisx)
void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHeavyBlock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHeavyBlock_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Heavy_Block_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgHidanCurtain_Init(BgHidanCurtain* this, GlobalContext* globalCtx);
void BgHidanCurtain_Destroy(BgHidanCurtain* this, GlobalContext* globalCtx);
void BgHidanCurtain_Update(BgHidanCurtain* this, GlobalContext* globalCtx);
void BgHidanCurtain_Draw(BgHidanCurtain* this, GlobalContext* globalCtx);
#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);
void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Curtain_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanDalm_Init(BgHidanDalm* this, GlobalContext* globalCtx);
void BgHidanDalm_Destroy(BgHidanDalm* this, GlobalContext* globalCtx);
void BgHidanDalm_Update(BgHidanDalm* this, GlobalContext* globalCtx);
void BgHidanDalm_Draw(BgHidanDalm* this, GlobalContext* globalCtx);
#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);
void BgHidanDalm_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Dalm_InitVars = {

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

@ -8,16 +8,19 @@
#define FLAGS 0x00000000
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx);
#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);
void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx);
s32 BgHidanFirewall_CheckProximity(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Wait(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Collide(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx);
extern Gfx D_0600DA80[];
@ -50,15 +53,11 @@ UNK_PTR D_80886D04[] = {
0x06015D20, 0x06016120, 0x06016520, 0x06016920, 0x06016D20, 0x06017120, 0x06017520, 0x06017920,
};
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) {
void BgHidanFirewall_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
f32 scale;
scale = 0.12f;
this->actor.scale.x = scale;
this->actor.scale.z = scale;
scale = 0.01f;
this->actor.scale.x = 0.12f;
this->actor.scale.z = 0.12f;
this->actor.scale.y = 0.01f;
this->unk_150 = 0;
@ -73,8 +72,9 @@ void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) {
this->actionFunc = (ActorFunc)BgHidanFirewall_Wait;
}
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx) {
BgHidanFirewall* thing = this;
void BgHidanFirewall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -170,9 +170,9 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext*
this->collider.dim.pos.z = this->actor.posRot.pos.z - sp30.x * sp28 + sp30.z * temp_ret;
}
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void BgHidanFirewall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
s32 pad;
this->unk_150 = (this->unk_150 + 1) % 8;
@ -190,8 +190,8 @@ void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) {
}
}
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx) {
UNK_PTR* temp;
void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = THIS;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];
@ -200,9 +200,7 @@ void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx) {
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 448);
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x14);
temp = D_80886D04;
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(temp[this->unk_150]));
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80886D04[this->unk_150]));
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 0xFF, 0xFF, 0x00, 0x96);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0xFF);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458),

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx);
void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx);
void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx);
void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx);
#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);
void BgHidanFslift_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx);
void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx);
@ -39,10 +41,11 @@ static InitChainEntry initChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
};
void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFslift* this = THIS;
s32 pad1;
s32 local_c = 0;
Actor* thisx = &this->dyna.actor;
s32 pad2;
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_SetActorMove(thisx, 1);
@ -58,6 +61,7 @@ void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) {
void func_80886F24(BgHidanFslift* this) {
Actor* thisx = &this->dyna.actor;
if (thisx->attachedB != NULL && thisx->attachedB->update != NULL) {
thisx->attachedB->posRot.pos.x = thisx->posRot.pos.x;
thisx->attachedB->posRot.pos.y = thisx->posRot.pos.y + 40.0f;
@ -67,7 +71,9 @@ void func_80886F24(BgHidanFslift* this) {
thisx->attachedB = NULL;
}
void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx) {
void BgHidanFslift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFslift* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -101,6 +107,7 @@ void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) {
void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) {
Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND);
func_80886FB4(this);
@ -112,6 +119,7 @@ void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) {
void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
if (func_80043590(thisx)) {
if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) {
Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND);
@ -125,8 +133,9 @@ void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) {
func_80886F24(this);
}
void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
void BgHidanFslift_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFslift* this = THIS;
this->actionFunc(this, globalCtx);
if (func_8004356C(thisx)) {
if (this->unk_16A == 0) {
@ -143,6 +152,6 @@ void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) {
}
}
void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) {
void BgHidanFslift_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_0600B630);
}

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgHidanFwbig_Init(BgHidanFwbig* this, GlobalContext* globalCtx);
void BgHidanFwbig_Destroy(BgHidanFwbig* this, GlobalContext* globalCtx);
void BgHidanFwbig_Update(BgHidanFwbig* this, GlobalContext* globalCtx);
void BgHidanFwbig_Draw(BgHidanFwbig* this, GlobalContext* globalCtx);
#define THIS ((BgHidanFwbig*)thisx)
void BgHidanFwbig_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFwbig_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFwbig_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Fwbig_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanHamstep_Init(BgHidanHamstep* this, GlobalContext* globalCtx);
void BgHidanHamstep_Destroy(BgHidanHamstep* this, GlobalContext* globalCtx);
void BgHidanHamstep_Update(BgHidanHamstep* this, GlobalContext* globalCtx);
void BgHidanHamstep_Draw(BgHidanHamstep* this, GlobalContext* globalCtx);
#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);
void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Hamstep_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgHidanHrock_Init(BgHidanHrock* this, GlobalContext* globalCtx);
void BgHidanHrock_Destroy(BgHidanHrock* this, GlobalContext* globalCtx);
void BgHidanHrock_Update(BgHidanHrock* this, GlobalContext* globalCtx);
void BgHidanHrock_Draw(BgHidanHrock* this, GlobalContext* globalCtx);
#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);
void BgHidanHrock_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Hrock_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgHidanKousi_Init(BgHidanKousi* this, GlobalContext* globalCtx);
void BgHidanKousi_Destroy(BgHidanKousi* this, GlobalContext* globalCtx);
void BgHidanKousi_Update(BgHidanKousi* this, GlobalContext* globalCtx);
void BgHidanKousi_Draw(BgHidanKousi* this, GlobalContext* globalCtx);
#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);
void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Kousi_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanKowarerukabe_Init(BgHidanKowarerukabe* this, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Destroy(BgHidanKowarerukabe* this, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Update(BgHidanKowarerukabe* this, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Draw(BgHidanKowarerukabe* this, GlobalContext* globalCtx);
#define THIS ((BgHidanKowarerukabe*)thisx)
void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Kowarerukabe_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanRock_Init(BgHidanRock* this, GlobalContext* globalCtx);
void BgHidanRock_Destroy(BgHidanRock* this, GlobalContext* globalCtx);
void BgHidanRock_Update(BgHidanRock* this, GlobalContext* globalCtx);
void BgHidanRock_Draw(BgHidanRock* this, GlobalContext* globalCtx);
#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);
void BgHidanRock_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Rock_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanRsekizou_Init(BgHidanRsekizou* this, GlobalContext* globalCtx);
void BgHidanRsekizou_Destroy(BgHidanRsekizou* this, GlobalContext* globalCtx);
void BgHidanRsekizou_Update(BgHidanRsekizou* this, GlobalContext* globalCtx);
void BgHidanRsekizou_Draw(BgHidanRsekizou* this, GlobalContext* globalCtx);
#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);
void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Rsekizou_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanSekizou_Init(BgHidanSekizou* this, GlobalContext* globalCtx);
void BgHidanSekizou_Destroy(BgHidanSekizou* this, GlobalContext* globalCtx);
void BgHidanSekizou_Update(BgHidanSekizou* this, GlobalContext* globalCtx);
void BgHidanSekizou_Draw(BgHidanSekizou* this, GlobalContext* globalCtx);
#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);
void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Sekizou_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgHidanSima_Init(BgHidanSima* this, GlobalContext* globalCtx);
void BgHidanSima_Destroy(BgHidanSima* this, GlobalContext* globalCtx);
void BgHidanSima_Update(BgHidanSima* this, GlobalContext* globalCtx);
void BgHidanSima_Draw(BgHidanSima* this, GlobalContext* globalCtx);
#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);
void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Sima_InitVars = {

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

@ -8,13 +8,16 @@
#define FLAGS 0x00000010
void BgHidanSyoku_Init(BgHidanSyoku* this, GlobalContext* globalCtx);
void BgHidanSyoku_Destroy(BgHidanSyoku* this, GlobalContext* globalCtx);
#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);
void BgHidanSyoku_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_8088F4B8(BgHidanSyoku* this, GlobalContext* globalCtx);
void func_8088F514(BgHidanSyoku* this, GlobalContext* globalCtx);
void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx);
void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx);
void BgHidanSyoku_Draw(BgHidanSyoku* this, GlobalContext* globalCtx);
const ActorInit Bg_Hidan_Syoku_InitVars = {
ACTOR_BG_HIDAN_SYOKU,
@ -35,19 +38,22 @@ static InitChainEntry initChain[] = {
extern UNK_PTR D_0600A7E0;
extern UNK_PTR D_0600E568;
void BgHidanSyoku_Init(BgHidanSyoku* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgHidanSyoku_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSyoku* this = THIS;
s32 pad;
u32 local_c = 0;
Actor_ProcessInitChain(&this->dyna.actor, initChain);
DynaPolyInfo_SetActorMove(&this->dyna.actor, 1);
DynaPolyInfo_SetActorMove(&this->dyna, 1);
DynaPolyInfo_Alloc(&D_0600E568, &local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c);
this->actionFunc = func_8088F4B8;
this->dyna.actor.initPosRot.pos.y += 540.0f;
}
void BgHidanSyoku_Destroy(BgHidanSyoku* this, GlobalContext* globalCtx) {
void BgHidanSyoku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSyoku* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -102,7 +108,9 @@ void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx) {
}
}
void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx) {
void BgHidanSyoku_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSyoku* this = THIS;
this->actionFunc(this, globalCtx);
if (func_8004356C(&this->dyna.actor)) {
if (this->unk_168 == 0) {
@ -119,6 +127,6 @@ void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx) {
}
}
void BgHidanSyoku_Draw(BgHidanSyoku* this, GlobalContext* globalCtx) {
void BgHidanSyoku_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_0600A7E0);
}

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgIceObjects_Init(BgIceObjects* this, GlobalContext* globalCtx);
void BgIceObjects_Destroy(BgIceObjects* this, GlobalContext* globalCtx);
void BgIceObjects_Update(BgIceObjects* this, GlobalContext* globalCtx);
void BgIceObjects_Draw(BgIceObjects* this, GlobalContext* globalCtx);
#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);
void BgIceObjects_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Ice_Objects_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgIceShelter_Init(BgIceShelter* this, GlobalContext* globalCtx);
void BgIceShelter_Destroy(BgIceShelter* this, GlobalContext* globalCtx);
void BgIceShelter_Update(BgIceShelter* this, GlobalContext* globalCtx);
void BgIceShelter_Draw(BgIceShelter* this, GlobalContext* globalCtx);
#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);
void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Ice_Shelter_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgIceShutter_Init(BgIceShutter* this, GlobalContext* globalCtx);
void BgIceShutter_Destroy(BgIceShutter* this, GlobalContext* globalCtx);
void BgIceShutter_Update(BgIceShutter* this, GlobalContext* globalCtx);
void BgIceShutter_Draw(BgIceShutter* this, GlobalContext* globalCtx);
#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);
void BgIceShutter_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Ice_Shutter_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgIceTurara_Init(BgIceTurara* this, GlobalContext* globalCtx);
void BgIceTurara_Destroy(BgIceTurara* this, GlobalContext* globalCtx);
void BgIceTurara_Update(BgIceTurara* this, GlobalContext* globalCtx);
void BgIceTurara_Draw(BgIceTurara* this, GlobalContext* globalCtx);
#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);
void BgIceTurara_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Ice_Turara_InitVars = {

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000000
void BgIngate_Init(BgIngate* this, GlobalContext* globalCtx);
void BgIngate_Destroy(BgIngate* this, GlobalContext* globalCtx);
void BgIngate_Update(BgIngate* this, GlobalContext* globalCtx);
void BgIngate_Draw(BgIngate* this, GlobalContext* globalCtx);
#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);
void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgIngate_SetupAction(BgIngate* this, ActorFunc actionFunc);
void func_80892890(BgIngate* this, GlobalContext* globalCtx);
void func_80892990(BgIngate* this, GlobalContext* globalCtx);

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgJya1flift_Init(BgJya1flift* this, GlobalContext* globalCtx);
void BgJya1flift_Destroy(BgJya1flift* this, GlobalContext* globalCtx);
void BgJya1flift_Update(BgJya1flift* this, GlobalContext* globalCtx);
void BgJya1flift_Draw(BgJya1flift* this, GlobalContext* globalCtx);
#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);
void BgJya1flift_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_1flift_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx);
void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx);
void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx);
void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx);
#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);
void BgJyaAmishutter_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808933BC(BgJyaAmishutter* this);
void func_808933CC(BgJyaAmishutter* this);
@ -58,13 +60,17 @@ void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 collisio
}
}
void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx) {
void BgJyaAmishutter_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
func_808932C0(this, globalCtx, &D_0600C4C8, 0);
Actor_ProcessInitChain(&this->actor, initChain);
func_808933BC(this);
}
void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) {
void BgJyaAmishutter_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
@ -116,10 +122,12 @@ void func_8089350C(BgJyaAmishutter* this) {
}
}
void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) {
void BgJyaAmishutter_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaAmishutter* this = THIS;
this->actionFunc(this);
}
void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) {
void BgJyaAmishutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_0600C0A0);
}

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000030
void BgJyaBigmirror_Init(BgJyaBigmirror* this, GlobalContext* globalCtx);
void BgJyaBigmirror_Destroy(BgJyaBigmirror* this, GlobalContext* globalCtx);
void BgJyaBigmirror_Update(BgJyaBigmirror* this, GlobalContext* globalCtx);
void BgJyaBigmirror_Draw(BgJyaBigmirror* this, GlobalContext* globalCtx);
#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);
void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Bigmirror_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgJyaBlock_Init(BgJyaBlock* this, GlobalContext* globalCtx);
void BgJyaBlock_Destroy(BgJyaBlock* this, GlobalContext* globalCtx);
void BgJyaBlock_Update(BgJyaBlock* this, GlobalContext* globalCtx);
void BgJyaBlock_Draw(BgJyaBlock* this, GlobalContext* globalCtx);
#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);
void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Block_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000001
void BgJyaBombchuiwa_Init(BgJyaBombchuiwa* this, GlobalContext* globalCtx);
void BgJyaBombchuiwa_Destroy(BgJyaBombchuiwa* this, GlobalContext* globalCtx);
void BgJyaBombchuiwa_Update(BgJyaBombchuiwa* this, GlobalContext* globalCtx);
void BgJyaBombchuiwa_Draw(BgJyaBombchuiwa* this, GlobalContext* globalCtx);
#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);
void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Bombchuiwa_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgJyaBombiwa_Init(BgJyaBombiwa* this, GlobalContext* globalCtx);
void BgJyaBombiwa_Destroy(BgJyaBombiwa* this, GlobalContext* globalCtx);
void BgJyaBombiwa_Update(BgJyaBombiwa* this, GlobalContext* globalCtx);
void BgJyaBombiwa_Draw(BgJyaBombiwa* this, GlobalContext* globalCtx);
#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);
void BgJyaBombiwa_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Bombiwa_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgJyaCobra_Init(BgJyaCobra* this, GlobalContext* globalCtx);
void BgJyaCobra_Destroy(BgJyaCobra* this, GlobalContext* globalCtx);
void BgJyaCobra_Update(BgJyaCobra* this, GlobalContext* globalCtx);
void BgJyaCobra_Draw(BgJyaCobra* this, GlobalContext* globalCtx);
#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);
void BgJyaCobra_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Cobra_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgJyaGoroiwa_Init(BgJyaGoroiwa* this, GlobalContext* globalCtx);
void BgJyaGoroiwa_Destroy(BgJyaGoroiwa* this, GlobalContext* globalCtx);
void BgJyaGoroiwa_Update(BgJyaGoroiwa* this, GlobalContext* globalCtx);
void BgJyaGoroiwa_Draw(BgJyaGoroiwa* this, GlobalContext* globalCtx);
#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);
void BgJyaGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Goroiwa_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgJyaHaheniron_Init(BgJyaHaheniron* this, GlobalContext* globalCtx);
void BgJyaHaheniron_Destroy(BgJyaHaheniron* this, GlobalContext* globalCtx);
void BgJyaHaheniron_Update(BgJyaHaheniron* this, GlobalContext* globalCtx);
void BgJyaHaheniron_Draw(BgJyaHaheniron* this, GlobalContext* globalCtx);
#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);
void BgJyaHaheniron_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Haheniron_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgJyaIronobj_Init(BgJyaIronobj* this, GlobalContext* globalCtx);
void BgJyaIronobj_Destroy(BgJyaIronobj* this, GlobalContext* globalCtx);
void BgJyaIronobj_Update(BgJyaIronobj* this, GlobalContext* globalCtx);
void BgJyaIronobj_Draw(BgJyaIronobj* this, GlobalContext* globalCtx);
#define THIS ((BgJyaIronobj*)thisx)
void BgJyaIronobj_Init(Actor* thisx, GlobalContext* globalCtx);
void BgJyaIronobj_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgJyaIronobj_Update(Actor* thisx, GlobalContext* globalCtx);
void BgJyaIronobj_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Ironobj_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx);
void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx);
void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx);
void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx);
#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);
void BgJyaKanaami_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80899880(BgJyaKanaami* this);
void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx);
@ -55,7 +57,9 @@ void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 collision,
}
}
void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) {
void BgJyaKanaami_Init(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
func_80899740(this, globalCtx, &D_0600F208, 0);
Actor_ProcessInitChain(&this->actor, initChain);
if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) {
@ -66,7 +70,9 @@ void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) {
osSyncPrintf("(jya 金網)(arg_data 0x%04x)\n", this->actor.params);
}
void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) {
void BgJyaKanaami_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
@ -111,13 +117,15 @@ void func_80899A08(BgJyaKanaami* this) {
this->actor.posRot.rot.x = 0x4000;
}
void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) {
void BgJyaKanaami_Update(Actor* thisx, GlobalContext* globalCtx) {
BgJyaKanaami* this = THIS;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);
}
this->actor.shape.rot.x = this->actor.posRot.rot.x;
}
void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) {
void BgJyaKanaami_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_0600F000);
}

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgJyaLift_Init(BgJyaLift* this, GlobalContext* globalCtx);
void BgJyaLift_Destroy(BgJyaLift* this, GlobalContext* globalCtx);
void BgJyaLift_Update(BgJyaLift* this, GlobalContext* globalCtx);
void BgJyaLift_Draw(BgJyaLift* this, GlobalContext* globalCtx);
#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);
void BgJyaLift_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Lift_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgJyaMegami_Init(BgJyaMegami* this, GlobalContext* globalCtx);
void BgJyaMegami_Destroy(BgJyaMegami* this, GlobalContext* globalCtx);
void BgJyaMegami_Update(BgJyaMegami* this, GlobalContext* globalCtx);
void BgJyaMegami_Draw(BgJyaMegami* this, GlobalContext* globalCtx);
#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);
void BgJyaMegami_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Megami_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgJyaZurerukabe_Init(BgJyaZurerukabe* this, GlobalContext* globalCtx);
void BgJyaZurerukabe_Destroy(BgJyaZurerukabe* this, GlobalContext* globalCtx);
void BgJyaZurerukabe_Update(BgJyaZurerukabe* this, GlobalContext* globalCtx);
void BgJyaZurerukabe_Draw(BgJyaZurerukabe* this, GlobalContext* globalCtx);
#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);
void BgJyaZurerukabe_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Jya_Zurerukabe_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000020
void BgMenkuriEye_Init(BgMenkuriEye* this, GlobalContext* globalCtx);
void BgMenkuriEye_Destroy(BgMenkuriEye* this, GlobalContext* globalCtx);
void BgMenkuriEye_Update(BgMenkuriEye* this, GlobalContext* globalCtx);
void BgMenkuriEye_Draw(BgMenkuriEye* this, GlobalContext* globalCtx);
#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);
void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Menkuri_Eye_InitVars = {

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

@ -6,15 +6,14 @@
#include "z_bg_menkuri_kaiten.h"
extern u32 D_060038D0;
extern u32 D_060042D8;
#define FLAGS 0x00000030
void BgMenkuriKaiten_Init(BgMenkuriKaiten* this, GlobalContext* globalCtx);
void BgMenkuriKaiten_Destroy(BgMenkuriKaiten* this, GlobalContext* globalCtx);
void BgMenkuriKaiten_Update(BgMenkuriKaiten* this, GlobalContext* globalCtx);
void BgMenkuriKaiten_Draw(BgMenkuriKaiten* this, GlobalContext* globalCtx);
#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);
void BgMenkuriKaiten_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Menkuri_Kaiten_InitVars = {
ACTOR_BG_MENKURI_KAITEN,
@ -32,8 +31,12 @@ static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
void BgMenkuriKaiten_Init(BgMenkuriKaiten* this, GlobalContext* globalCtx) {
s32 pad[2];
extern u32 D_060038D0;
extern u32 D_060042D8;
void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
s32 pad;
u32 local_c = 0;
Actor_ProcessInitChain(&this->actor, initChain);
@ -42,17 +45,21 @@ void BgMenkuriKaiten_Init(BgMenkuriKaiten* this, GlobalContext* globalCtx) {
this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c);
}
void BgMenkuriKaiten_Destroy(BgMenkuriKaiten* this, GlobalContext* globalCtx) {
void BgMenkuriKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
void BgMenkuriKaiten_Update(BgMenkuriKaiten* this, GlobalContext* globalCtx) {
void BgMenkuriKaiten_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriKaiten* this = THIS;
if (!Flags_GetSwitch(globalCtx, this->actor.params) && func_80043590(&this->actor)) {
func_8002F974(&this->actor, 0x2024);
this->actor.shape.rot.y += 0x80;
}
}
void BgMenkuriKaiten_Draw(BgMenkuriKaiten* this, GlobalContext* globalCtx) {
void BgMenkuriKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_060038D0);
}

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgMenkuriNisekabe_Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx);
void BgMenkuriNisekabe_Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx);
void BgMenkuriNisekabe_Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx);
void BgMenkuriNisekabe_Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx);
#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);
void BgMenkuriNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Menkuri_Nisekabe_InitVars = {
ACTOR_BG_MENKURI_NISEKABE,
@ -27,14 +29,18 @@ const ActorInit Bg_Menkuri_Nisekabe_InitVars = {
static u32 segmentAddr[] = { 0x06002280, 0x06002BC0 };
void BgMenkuriNisekabe_Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx) {
void BgMenkuriNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
Actor_SetScale(&this->actor, 0.1f);
}
void BgMenkuriNisekabe_Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx) {
void BgMenkuriNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMenkuriNisekabe_Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) {
void BgMenkuriNisekabe_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
if (globalCtx->actorCtx.unk_03 != 0) {
this->actor.flags |= 0x80;
} else {
@ -42,7 +48,8 @@ void BgMenkuriNisekabe_Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx)
}
}
void BgMenkuriNisekabe_Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) {
void BgMenkuriNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriNisekabe* this = THIS;
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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgMizuBwall_Init(BgMizuBwall* this, GlobalContext* globalCtx);
void BgMizuBwall_Destroy(BgMizuBwall* this, GlobalContext* globalCtx);
void BgMizuBwall_Update(BgMizuBwall* this, GlobalContext* globalCtx);
void BgMizuBwall_Draw(BgMizuBwall* this, GlobalContext* globalCtx);
#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);
void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Mizu_Bwall_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgMizuMovebg_Init(BgMizuMovebg* this, GlobalContext* globalCtx);
void BgMizuMovebg_Destroy(BgMizuMovebg* this, GlobalContext* globalCtx);
void BgMizuMovebg_Update(BgMizuMovebg* this, GlobalContext* globalCtx);
void BgMizuMovebg_Draw(BgMizuMovebg* this, GlobalContext* globalCtx);
#define THIS ((BgMizuMovebg*)thisx)
void BgMizuMovebg_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMizuMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMizuMovebg_Update(Actor* thisx, GlobalContext* globalCtx);
void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Mizu_Movebg_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgMizuShutter_Init(BgMizuShutter* this, GlobalContext* globalCtx);
void BgMizuShutter_Destroy(BgMizuShutter* this, GlobalContext* globalCtx);
void BgMizuShutter_Update(BgMizuShutter* this, GlobalContext* globalCtx);
void BgMizuShutter_Draw(BgMizuShutter* this, GlobalContext* globalCtx);
#define THIS ((BgMizuShutter*)thisx)
void BgMizuShutter_Init(Actor* thisx, GlobalContext* globalCtx);
void BgMizuShutter_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgMizuShutter_Update(Actor* thisx, GlobalContext* globalCtx);
void BgMizuShutter_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Mizu_Shutter_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx);
void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx);
void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx);
void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx);
#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);
void BgMizuUzu_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Mizu_Uzu_InitVars = {
ACTOR_BG_MIZU_UZU,
@ -35,10 +37,12 @@ extern u32 D_060074EC;
void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx);
void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgMizuUzu_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMizuUzu* this = THIS;
s32 pad;
s32 local_c = 0;
Actor* thisx = &this->dyna.actor;
s32 pad2;
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_SetActorMove(thisx, 0);
DynaPolyInfo_Alloc(&D_060074EC, &local_c);
@ -46,12 +50,15 @@ void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) {
this->actionFunc = func_8089F788;
}
void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx) {
void BgMizuUzu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMizuUzu* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
if (PLAYER->currentBoots == 1) {
func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
} else {
@ -61,9 +68,11 @@ void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) {
thisx->shape.rot.y += 0x1C0;
}
void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx) {
void BgMizuUzu_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMizuUzu* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx) {
void BgMizuUzu_Draw(Actor* thisx, GlobalContext* globalCtx) {
}

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000030
void BgMizuWater_Init(BgMizuWater* this, GlobalContext* globalCtx);
void BgMizuWater_Destroy(BgMizuWater* this, GlobalContext* globalCtx);
void BgMizuWater_Update(BgMizuWater* this, GlobalContext* globalCtx);
void BgMizuWater_Draw(BgMizuWater* this, GlobalContext* globalCtx);
#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);
void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Mizu_Water_InitVars = {

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

@ -8,13 +8,16 @@
#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);
void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc);
void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx);
void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx);
void func_808A0850(BgMjin* this, GlobalContext* globalCtx);
void func_808A0920(BgMjin* this, GlobalContext* globalCtx);
void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx);
void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx);
const ActorInit Bg_Mjin_InitVars = {
ACTOR_BG_MJIN,
@ -47,8 +50,8 @@ void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
void BgMjin_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
s8 objBankIndex;
Actor_ProcessInitChain(thisx, initChain);
@ -61,7 +64,9 @@ void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) {
}
}
void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) {
void BgMjin_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -80,27 +85,29 @@ void func_808A0850(BgMjin* this, GlobalContext* globalCtx) {
this->dyna.dynaPolyId =
DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c);
BgMjin_SetupAction(this, &func_808A0920);
this->dyna.actor.draw = &BgMjin_Draw;
this->dyna.actor.draw = BgMjin_Draw;
}
}
void func_808A0920(BgMjin* this, GlobalContext* globalCtx) {
}
void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) {
void BgMjin_Update(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) {
s32 objBankIndex;
void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = THIS;
u32 dlist;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
s32 pad;
s32 objBankIndex;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
if (this->dyna.actor.params != 0) {
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->dyna.actor.params - 1]);
if (thisx->params != 0) {
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[thisx->params - 1]);
if (objBankIndex >= 0) {
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment);
}

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000010
void BgMoriBigst_Init(BgMoriBigst* this, GlobalContext* globalCtx);
void BgMoriBigst_Destroy(BgMoriBigst* this, GlobalContext* globalCtx);
void BgMoriBigst_Update(BgMoriBigst* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Bigst_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000010
void BgMoriElevator_Init(BgMoriElevator* this, GlobalContext* globalCtx);
void BgMoriElevator_Destroy(BgMoriElevator* this, GlobalContext* globalCtx);
void BgMoriElevator_Update(BgMoriElevator* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Elevator_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000000
void BgMoriHashigo_Init(BgMoriHashigo* this, GlobalContext* globalCtx);
void BgMoriHashigo_Destroy(BgMoriHashigo* this, GlobalContext* globalCtx);
void BgMoriHashigo_Update(BgMoriHashigo* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Hashigo_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000010
void BgMoriHashira4_Init(BgMoriHashira4* this, GlobalContext* globalCtx);
void BgMoriHashira4_Destroy(BgMoriHashira4* this, GlobalContext* globalCtx);
void BgMoriHashira4_Update(BgMoriHashira4* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Hashira4_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000030
void BgMoriHineri_Init(BgMoriHineri* this, GlobalContext* globalCtx);
void BgMoriHineri_Destroy(BgMoriHineri* this, GlobalContext* globalCtx);
void BgMoriHineri_Update(BgMoriHineri* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Hineri_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000030
void BgMoriIdomizu_Init(BgMoriIdomizu* this, GlobalContext* globalCtx);
void BgMoriIdomizu_Destroy(BgMoriIdomizu* this, GlobalContext* globalCtx);
void BgMoriIdomizu_Update(BgMoriIdomizu* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Idomizu_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000000
void BgMoriKaitenkabe_Init(BgMoriKaitenkabe* this, GlobalContext* globalCtx);
void BgMoriKaitenkabe_Destroy(BgMoriKaitenkabe* this, GlobalContext* globalCtx);
void BgMoriKaitenkabe_Update(BgMoriKaitenkabe* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Kaitenkabe_InitVars = {

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

@ -2,9 +2,11 @@
#define FLAGS 0x00000030
void BgMoriRakkatenjo_Init(BgMoriRakkatenjo* this, GlobalContext* globalCtx);
void BgMoriRakkatenjo_Destroy(BgMoriRakkatenjo* this, GlobalContext* globalCtx);
void BgMoriRakkatenjo_Update(BgMoriRakkatenjo* this, GlobalContext* globalCtx);
#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);
/*
const ActorInit Bg_Mori_Rakkatenjo_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgPoEvent_Init(BgPoEvent* this, GlobalContext* globalCtx);
void BgPoEvent_Destroy(BgPoEvent* this, GlobalContext* globalCtx);
void BgPoEvent_Update(BgPoEvent* this, GlobalContext* globalCtx);
void BgPoEvent_Draw(BgPoEvent* this, GlobalContext* globalCtx);
#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);
void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Po_Event_InitVars = {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000000
void BgPoSyokudai_Init(BgPoSyokudai* this, GlobalContext* globalCtx);
void BgPoSyokudai_Destroy(BgPoSyokudai* this, GlobalContext* globalCtx);
void BgPoSyokudai_Update(BgPoSyokudai* this, GlobalContext* globalCtx);
void BgPoSyokudai_Draw(BgPoSyokudai* this, GlobalContext* globalCtx);
#define THIS ((BgPoSyokudai*)thisx)
void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx);
void BgPoSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgPoSyokudai_Update(Actor* thisx, GlobalContext* globalCtx);
void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Po_Syokudai_InitVars = {

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

@ -8,12 +8,15 @@
#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);
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc);
void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx);
void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx);
const ActorInit Bg_Pushbox_InitVars = {
ACTOR_BG_PUSHBOX,
@ -38,10 +41,11 @@ void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
s32 pad;
u32 local_c = 0;
Actor* thisx = &this->dyna.actor;
s32 pad2;
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
@ -51,7 +55,9 @@ void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) {
func_808A8AE0(this, &func_808A8BAC);
}
void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -66,12 +72,14 @@ void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) {
func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D);
}
void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
this->actionFunc(this, globalCtx);
func_8002DF90(this);
}
void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgRelayObjects_Init(BgRelayObjects* this, GlobalContext* globalCtx);
void BgRelayObjects_Destroy(BgRelayObjects* this, GlobalContext* globalCtx);
void BgRelayObjects_Update(BgRelayObjects* this, GlobalContext* globalCtx);
void BgRelayObjects_Draw(BgRelayObjects* this, GlobalContext* globalCtx);
#define THIS ((BgRelayObjects*)thisx)
void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx);
void BgRelayObjects_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgRelayObjects_Update(Actor* thisx, GlobalContext* globalCtx);
void BgRelayObjects_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Relay_Objects_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgSpot00Break_Init(BgSpot00Break* this, GlobalContext* globalCtx);
void BgSpot00Break_Destroy(BgSpot00Break* this, GlobalContext* globalCtx);
void BgSpot00Break_Update(BgSpot00Break* this, GlobalContext* globalCtx);
void BgSpot00Break_Draw(BgSpot00Break* this, GlobalContext* globalCtx);
#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);
void BgSpot00Break_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Spot00_Break_InitVars = {
ACTOR_BG_SPOT00_BREAK,
@ -37,8 +39,9 @@ extern D_06000908; // segmented address: 0x06000908
extern D_06000980; // segmented address: 0x06000980
extern D_06000440; // segmented address: 0x06000440
void BgSpot00Break_Init(BgSpot00Break* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
s32 pad;
u32 local_c = 0;
Actor_ProcessInitChain(&this->actor, initChain);
@ -57,14 +60,18 @@ void BgSpot00Break_Init(BgSpot00Break* this, GlobalContext* globalCtx) {
}
}
void BgSpot00Break_Destroy(BgSpot00Break* this, GlobalContext* globalCtx) {
void BgSpot00Break_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
void BgSpot00Break_Update(BgSpot00Break* this, GlobalContext* globalCtx) {
void BgSpot00Break_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot00Break_Draw(BgSpot00Break* this, GlobalContext* globalCtx) {
void BgSpot00Break_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgSpot00Break* this = THIS;
if (this->actor.params == 1) {
Gfx_DrawDListOpa(globalCtx, &D_06000980);
} else {

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgSpot00Hanebasi_Init(BgSpot00Hanebasi* this, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Destroy(BgSpot00Hanebasi* this, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Update(BgSpot00Hanebasi* this, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Draw(BgSpot00Hanebasi* this, GlobalContext* globalCtx);
#define THIS ((BgSpot00Hanebasi*)thisx)
void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Update(Actor* thisx, GlobalContext* globalCtx);
void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Spot00_Hanebasi_InitVars = {

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx);
void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx);
void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx);
void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx);
#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);
void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx);
@ -40,7 +42,9 @@ void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) {
void BgSpot01Fusya_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Fusya* this = THIS;
Actor_ProcessInitChain(&this->actor, initChain);
this->unk_154 = 100.0f;
this->unk_158 = 100.0f;
@ -51,12 +55,13 @@ void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) {
BgSpot01Fusya_SetupAction(this, func_808AAA50);
}
void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) {
void BgSpot01Fusya_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) {
f32 temp;
Actor* thisx = &this->actor;
if (gSaveContext.eventChkInf[6] & 0x20) {
this->unk_158 = 1800.0f;
}
@ -66,11 +71,13 @@ void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) {
Math_SmoothScaleMaxF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f);
}
void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx) {
void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Fusya* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) {
void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];

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

@ -2,10 +2,12 @@
#define FLAGS 0x00000010
void BgSpot01Idohashira_Init(BgSpot01Idohashira* this, GlobalContext* globalCtx);
void BgSpot01Idohashira_Destroy(BgSpot01Idohashira* this, GlobalContext* globalCtx);
void BgSpot01Idohashira_Update(BgSpot01Idohashira* this, GlobalContext* globalCtx);
void BgSpot01Idohashira_Draw(BgSpot01Idohashira* this, GlobalContext* globalCtx);
#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);
void BgSpot01Idohashira_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Spot01_Idohashira_InitVars = {

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

@ -8,10 +8,13 @@
#define FLAGS 0x00000020
void BgSpot01Idomizu_Init(BgSpot01Idomizu* this, GlobalContext* globalCtx);
void BgSpot01Idomizu_Destroy(BgSpot01Idomizu* this, GlobalContext* globalCtx);
void BgSpot01Idomizu_Update(BgSpot01Idomizu* this, GlobalContext* globalCtx);
void BgSpot01Idomizu_Draw(BgSpot01Idomizu* this, GlobalContext* globalCtx);
#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);
void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808ABB84(BgSpot01Idomizu* this, GlobalContext* globalCtx);
/*

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

@ -8,10 +8,12 @@
#define FLAGS 0x00000010
void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx);
void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx);
void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx);
void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx);
#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);
void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx);
@ -37,10 +39,12 @@ void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgSpot01Idosoko_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idosoko* this = THIS;
s32 pad;
s32 local_c = 0;
Actor* thisx = &this->dyna.actor;
s32 pad2;
DynaPolyInfo_SetActorMove(thisx, 1);
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_Alloc(&D_06003C64, &local_c);
@ -52,20 +56,24 @@ void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
}
}
void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
void BgSpot01Idosoko_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idosoko* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
}
void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Idosoko* this = THIS;
this->actionFunc(this, globalCtx);
}
extern u32 D_06003B20;
void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];

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

@ -8,9 +8,12 @@
#define FLAGS 0x00000010
void BgSpot01Objects2_Init(BgSpot01Objects2* this, GlobalContext* globalCtx);
void BgSpot01Objects2_Destroy(BgSpot01Objects2* this, GlobalContext* globalCtx);
void BgSpot01Objects2_Update(BgSpot01Objects2* this, GlobalContext* globalCtx);
#define THIS ((BgSpot01Objects2*)thisx)
void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Objects2_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot01Objects2_Update(Actor* thisx, GlobalContext* globalCtx);
// func_808AC22C
void func_808AC2BC(BgSpot01Objects2* this, GlobalContext* globalCtx);
void func_808AC474(BgSpot01Objects2* this, GlobalContext* globalCtx);

10
src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
View file

@ -2,10 +2,12 @@
#define FLAGS 0x00000030
void BgSpot02Objects_Init(BgSpot02Objects* this, GlobalContext* globalCtx);
void BgSpot02Objects_Destroy(BgSpot02Objects* this, GlobalContext* globalCtx);
void BgSpot02Objects_Update(BgSpot02Objects* this, GlobalContext* globalCtx);
void BgSpot02Objects_Draw(BgSpot02Objects* this, GlobalContext* globalCtx);
#define THIS ((BgSpot02Objects*)thisx)
void BgSpot02Objects_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot02Objects_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot02Objects_Update(Actor* thisx, GlobalContext* globalCtx);
void BgSpot02Objects_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Spot02_Objects_InitVars = {

10
src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
View file

@ -8,10 +8,12 @@
#define FLAGS 0x00000030
void BgSpot03Taki_Init(BgSpot03Taki* this, GlobalContext* globalCtx);
void BgSpot03Taki_Destroy(BgSpot03Taki* this, GlobalContext* globalCtx);
void BgSpot03Taki_Update(BgSpot03Taki* this, GlobalContext* globalCtx);
void BgSpot03Taki_Draw(BgSpot03Taki* this, GlobalContext* globalCtx);
#define THIS ((BgSpot03Taki*)thisx)
void BgSpot03Taki_Init(Actor* thisx, GlobalContext* globalCtx);
void BgSpot03Taki_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgSpot03Taki_Update(Actor* thisx, GlobalContext* globalCtx);
void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Spot03_Taki_InitVars = {

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