kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

address variaty of compiler warnings and code documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-03 01:30:35 -06:00
parent 263b5bab4e
commit 1c063c781c
211 changed files with 1341 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/bs/ant.c
View File

@@ -482,4 +482,4 @@ void bsant_drone_update(void){
void bsant_drone_end(void){
bsdrone_end();
func_8029E4EC();
}
}

6
src/core2/bs/bBarge.c
View File

@@ -51,9 +51,9 @@ void func_8029F4F0(void){
}
void func_8029F60C(void){
f32 plyrPos[3];
_player_getPosition(&plyrPos);
func_8032728C(plyrPos, 50.0f, 2, func_8029F4E0);
f32 player_position[3];
_player_getPosition(player_position);
func_8032728C(player_position, 50.0f, 2, func_8029F4E0);
}

2
src/core2/bs/bFlap.c
View File

@@ -196,4 +196,4 @@ void bsbflap_end(void) {
func_80297B94();
func_8029E090(0, 0.2f);
func_8030DA44(D_8037D30C);
}
}

8
src/core2/bs/bFly.c
View File

@@ -405,7 +405,7 @@ void func_802A411C(void) {
} else {
sp44 = 0;
}
ml_vec3f_copy(sp28, &D_8037D338);
ml_vec3f_copy(sp28, D_8037D338);
ml_vec3f_normalize(sp28);
sp24 = mlAbsF(sp34[0] * sp28[0] + sp34[1] * sp28[1] + sp34[2] * sp28[2]);
if (miscflag_isTrue(8) || ((sp44 & 0x80) != 0)) {
@@ -705,15 +705,15 @@ void func_802A4D70(void){
void func_802A4D90(void) {
f32 sp34;
f32 sp28[3];
f32 player_position[3];
f32 sp1C[3];
func_802BB3DC(2, 100.0f, 0.85f);
func_8028A274(0x10D, 1.0f);
func_8030E58C(SFX_56_BANJO_HUI, 1.0f);
_player_getPosition(&sp28);
_player_getPosition(player_position);
func_80294980(sp1C);
func_80257F18(sp1C, sp28, &sp34);
func_80257F18(sp1C, player_position, &sp34);
yaw_setIdeal(mlNormalizeAngle(sp34 + 180.0f));
yaw_applyIdeal();
func_80297970(1300.0f);

8
src/core2/bs/bbuster.c
View File

@@ -85,7 +85,7 @@ void bsbbuster_update(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
s32 sp3C;
f32 sp30[3];
s32 sp24[3];
f32 player_position[3];
D_8037D2B8 = 0;
if(animctrl_isAt(aCtrl, 0.24f))
@@ -144,8 +144,8 @@ void bsbbuster_update(void){
D_8037D2B8 = 1;
D_8037D2B0 = 0.09f;
D_8037D2BA = 3;
_player_getPosition(&sp24);
func_8032728C(sp24, 150.0f, 2, func_8029FB20);
_player_getPosition(player_position);
func_8032728C(player_position, 150.0f, 2, func_8029FB20);
if(func_802931DC(&sp3C)){
sp44 = BS_SPLAT;
}
@@ -205,4 +205,4 @@ void bsbbuster_end(void){
void func_802A02B4(s32 arg0){
D_8037D2BB = arg0;
}
}

12
src/core2/bs/beeFly.c
View File

@@ -30,15 +30,15 @@ u8 D_8037D2C0;
int bsBeeFly_inSet(s32);
void func_802A04F0(void){
f32 plyrPos[3]; //sp1C
f32 player_position[3];
_player_getPosition(&plyrPos);
plyrPos[0] += randf2(-30.0f, 30.0f);
plyrPos[1] += 30.0f + randf2(0.0f, 30.0f);
plyrPos[2] += randf2(-30.0f, 30.0f);
_player_getPosition(player_position);
player_position[0] += randf2(-30.0f, 30.0f);
player_position[1] += 30.0f + randf2(0.0f, 30.0f);
player_position[2] += randf2(-30.0f, 30.0f);
func_803541C0(3);
func_803541CC(0x50);
func_80354030(plyrPos, 0.5f);
func_80354030(player_position, 0.5f);
}

40
src/core2/bs/croc.c
View File

@@ -204,12 +204,12 @@ void bscroc_jump_init(void){
void bscroc_jump_update(void){
enum bs_e sp2C = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
f32 player_velocity[3];
func_802ABE70();
func_802ABF54();
_get_velocity(&sp1C);
if(button_released(BUTTON_A) && 0.0f < sp1C[1])
_get_velocity(player_velocity);
if(button_released(BUTTON_A) && 0.0f < player_velocity[1])
gravity_reset();
switch(D_8037D3EC){
@@ -283,12 +283,12 @@ void bscroc_fall_init(void){
void bscroc_fall_update(void){
enum bs_e next_state = 0;
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
f32 velocity[3];
f32 player_velocity[3];
func_802ABE70();
func_80299628(0);
func_802ABF54();
_get_velocity(&velocity);
_get_velocity(player_velocity);
switch(D_8037D3EC){
case 0:
@@ -328,7 +328,7 @@ void bscroc_fall_end(void){
static void __bscroc_recoil_init(s32 damage){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp38;
f32 sp2C[3];
f32 player_position[3];
f32 sp20[3];
animctrl_reset(aCtrl);
@@ -342,9 +342,9 @@ static void __bscroc_recoil_init(s32 damage){
else
func_8030E58C(SFX_56_BANJO_HUI, 1.8f);
_player_getPosition(&sp2C);
func_80294980(&sp20);
func_80257F18(&sp20, &sp2C, &sp38);
_player_getPosition(player_position);
func_80294980(sp20);
func_80257F18(sp20, player_position, &sp38);
yaw_setIdeal(mlNormalizeAngle(sp38 + 180.0f));
yaw_applyIdeal();
func_80297970(200.0f);
@@ -415,7 +415,7 @@ void bscroc_bounce_end(void){
void bscroc_die_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
f32 sp38;
f32 sp2C[3];
f32 player_position[3];
f32 sp20[3];
func_8029B930();
@@ -427,9 +427,9 @@ void bscroc_die_init(void){
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bscroc.c", 0x32b);
func_8029C7F4(1,1,2,3);
_player_getPosition(&sp2C);
func_80294980(&sp20);
func_80257F18(&sp20, &sp2C, &sp38);
_player_getPosition(player_position);
func_80294980(sp20);
func_80257F18(sp20, player_position, &sp38);
yaw_setIdeal(mlNormalizeAngle(sp38 + 180.0f));
yaw_applyIdeal();
D_8037D3E0 = 250.0f;
@@ -504,9 +504,9 @@ static void func_802ACF58(void){
f32 sp2C;
f32 sp20[3];
sp2C = func_8028B2E8() ? 500.0f : 400.0f;
func_802589E4(&sp20, yaw_get(), sp2C);
func_802589E4(sp20, yaw_get(), sp2C);
sp20[1] = 200.0f;
func_80297A0C(&sp20);
func_80297A0C(sp20);
}
void bscroc_bite_init(void){
@@ -595,13 +595,13 @@ void bscroc_eat_bad_end(void){
void func_802AD2A8(Gfx **gdl, Mtx **mPtr, void *arg2){
f32 sp34[3];
f32 player_rotation[3];
f32 sp28[3];
player_getRotation(&sp34);
func_8028E9C4(2, &sp28);
player_getRotation(player_rotation);
func_8028E9C4(2, sp28);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_draw(gdl, mPtr, &sp28, &sp34, D_8037D3F0, NULL, D_8037D3E8);
modelRender_draw(gdl, mPtr, sp28, player_rotation, D_8037D3F0, NULL, D_8037D3E8);
}
@@ -705,4 +705,4 @@ void bscroc_drone_update(void){
void bscroc_drone_end(void){
bsdrone_end();
func_802ABFBC();
}
}

25
src/core2/bs/dronexform.c
View File

@@ -42,8 +42,11 @@ void func_802AF7A0(ParticleEmitter *arg0, enum asset_e arg1){
func_802EFF50(arg0, 1.0f);
}
void func_802AF88C(Actor * arg0, f32 arg1, f32 arg2){
particleEmitter_setParticleVelocityRange(arg0, arg1*30.0f, 10.0f, arg2*30.0f, arg1*30.0f, 10.0f, arg2*30.0f);
void func_802AF88C(ParticleEmitter * arg0, f32 arg1, f32 arg2){
particleEmitter_setParticleVelocityRange(arg0,
arg1*30.0f, 10.0f, arg2*30.0f,
arg1*30.0f, 10.0f, arg2*30.0f
);
func_802EFB70(arg0, D_8037D470.unk14, D_8037D470.unk14);
}
@@ -55,7 +58,7 @@ void func_802AF900(void){
f32 sp3C;
f32 sp30[3];
player_getPosition(&sp30);
player_getPosition(sp30);
sp3C = D_8037D470.unk8;
sp48 = func_80257A44(sp3C, 0.38f);
sp4C = sp48 * 6.283185308;
@@ -65,16 +68,16 @@ void func_802AF900(void){
sp30[1] += func_80257C48(func_80257A44(sp3C, 1.14f), 0.0f, 130.0f);
sp30[2] += sp44 * D_8037D470.unk18;
func_802AF88C(D_8037D470.unk4, sp40, sp44);
particleEmitter_setPosition(D_8037D470.unk4, &sp30);
particleEmitter_setPosition(D_8037D470.unk4, sp30);
particleEmitter_emitN(D_8037D470.unk4, 1);
player_getPosition(&sp30);
player_getPosition(sp30);
sp4C = (1.0 - func_802588B0(sp48 + 0.5, 1.0f))* 6.283185308;
sp30[0] -= sinf(sp4C) * D_8037D470.unk18;
sp30[1] += func_80257C48(func_80257A44(sp3C, 1.14f), 130.0f, 0.0f);
sp30[2] -= cosf(sp4C) * D_8037D470.unk18;
func_802AF88C(D_8037D470.unk0, sp40, sp44);
particleEmitter_setPosition(D_8037D470.unk0, &sp30);
particleEmitter_setPosition(D_8037D470.unk0, sp30);
particleEmitter_emitN(D_8037D470.unk0, 1);
}
@@ -110,7 +113,7 @@ void func_802AFBAC(f32 arg0){
D_8037D470.unk14 = arg0;
}
void func_802AFBB8(f32 (* arg0)[3]){
void func_802AFBB8(f32 arg0[3]){
static struct41s D_80364BB0 = {
{{-150.0f, 10.0f, -150.0f}, { 150.0f, 50.0f, 150.0f}},
{{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}}
@@ -276,10 +279,10 @@ static void __bsdronexform_setState(int arg0){
break;
case 5:// 802B02F4
_player_getPosition(&sp24);
_player_getPosition(sp24);
sp24[1] += 30.0f;
func_8024E3A8(&sp24, 80.0f);
func_802AFBB8(&sp24);
func_8024E3A8(sp24, 80.0f);
func_802AFBB8(sp24);
func_8029E3C0(0, 0.1f);
break;
@@ -443,4 +446,4 @@ void bsdronexform_end(void){
miscflag_clear(MISC_FLAG_1B_TRANSFORMING);
}
void bsdronexform_interrupt(void){};
void bsdronexform_interrupt(void){}

8
src/core2/bs/jump.c
View File

@@ -95,7 +95,7 @@ void bsjump_update(void){
func_802B6FA8();
}
_get_velocity(&velocity);
_get_velocity(velocity);
if((button_released(BUTTON_A) && 0.0f < velocity[1] && !D_8037D4C2) || !can_control_jump_height()){
gravity_reset();
}
@@ -189,14 +189,14 @@ void bsjump_fall_init(void){
void bsjump_fall_update(void){
enum bs_e sp2C = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
f32 player_velocity[3];
if(miscflag_isTrue(0xf))
func_802978A4();
else
func_802B6FA8();
_get_velocity(&sp1C);
_get_velocity(player_velocity);
switch(D_8037D4C0){
case 0://L802B17B8
@@ -245,7 +245,7 @@ void bsjump_fall_update(void){
bs_setState(sp2C);
}
void bsjump_fall_end(void){};
void bsjump_fall_end(void){}
void func_802B1928(void) {
AnimCtrl *anim_ctrl;

12
src/core2/bs/throw.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
extern ActorMarker *carriedobj_getMarker(void);
/* .bss */
u8 D_8037D580;
@@ -28,16 +30,16 @@ void bsthrow_update(void){
enum bs_e next_state = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp34[3];
f32 sp28[3];
f32 player_position[3];
f32 sp24;
ActorMarker *sp20 = carriedobj_getMarker();
if(D_8037D580 == 0 && sp20 != NULL)
func_802948F8(sp20);
_player_getPosition(&sp28);
func_80294A1C(&sp34);
func_80257F18(&sp28, &sp34, &sp24);
_player_getPosition(player_position);
func_80294A1C(sp34);
func_80257F18(player_position, sp34, &sp24);
yaw_setIdeal(sp24);
if(animctrl_isAt(aCtrl, 0.35f) && sp20){
@@ -71,4 +73,4 @@ void bsthrow_interrupt(void){
else{ //L802B6748
func_80296608();
}
}
}

2
src/core2/bs/walrus.c
View File

@@ -774,4 +774,4 @@ void bswalrus_sled_drone_update(void){
void bswalrus_sled_drone_end(void){
bsdrone_end();
func_802B80D0();
}
}

6
src/core2/ch/badShad.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_802C3D3C(void (*)(s32, s32), s32, s32);
extern void __spawnQueue_add_2(void (*)(s32, s32), s32, s32);
Actor *func_802D6F48(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_802D6EA0(Actor *this);
@@ -38,7 +38,7 @@ void func_802D6EA0(Actor *this){
Actor *func_802D6F48(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp44[3];
f32 sp40;
Actor *this = func_80325300(marker, sp44);
Actor *this = marker_getActorAndRotation(marker, sp44);
Actor *other;
if(this->despawn_flag)
return this;
@@ -136,7 +136,7 @@ void func_802D729C(Actor *actor, f32 arg1){
return;
}
if(!actor->unk104){
func_802C3D3C(func_802D71A0, (s32) actor->marker, reinterpret_cast(s32, arg1));
__spawnQueue_add_2((GenMethod_2)func_802D71A0, (s32) actor->marker, reinterpret_cast(s32, arg1));
return;
}

8
src/core2/ch/beehive.c
View File

@@ -13,13 +13,13 @@ ActorAnimationInfo D_803672C0[] ={
};
ActorInfo D_803672E0 = {0x50, ACTOR_12_BEEHIVE, ASSET_364_MODEL_BEEHIVE,
1, &D_803672C0,
1, D_803672C0,
func_802CE8D4, func_80326224, func_80325888,
0, 0x333, 0.0f, 0
};
/* .code */
void func_802CE7E0(ActorMarker *marker, s32 arg1){
void func_802CE7E0(ActorMarker *marker, ActorMarker *other){
Actor *actor = marker_getActor(marker);
FUNC_8030E8B4(SFX_11_WOOD_BREAKING_1, 1.0f, 28000, actor->position, 300, 3000);
FUNC_8030E8B4(SFX_D_EGGSHELL_BREAKING, 1.0f, 28000, actor->position, 300, 3000);
@@ -27,8 +27,8 @@ void func_802CE7E0(ActorMarker *marker, s32 arg1){
actor_playAnimationOnce(actor);
marker->collidable = FALSE;
actor->unk138_27 = 3;
func_802C3F04(func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
func_802C3F04(func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
actor->marker->propPtr->unk8_3 = 0;
func_803115C4(ASSET_D96_TEXT_BEEHIVE);
func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES);

2
src/core2/ch/clucker.c
View File

@@ -91,7 +91,7 @@ void func_80357264(Actor *this, s32 next_state){
if(next_state == 5){
if(!levelSpecificFlags_get(0x14)
&& !( func_80326D68(this->position, 0x318, -1, &sp38) && ( sp38 < 250.0f))
&& !( actorArray_findClosestActorFromActorId(this->position, 0x318, -1, &sp38) && ( sp38 < 250.0f))
){
levelSpecificFlags_set(0x14, TRUE);
func_80324E38(0.0f, 3);

6
src/core2/ch/code_5AB30.c
View File

@@ -183,7 +183,7 @@ void func_802E1FD0(ActorMarker *marker, ActorMarker *other_marker){
FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
__spawnqueue_add_1((GenMethod_1)func_802E1BD0, (s32)actor->marker);
__spawnQueue_add_1((GenMethod_1)func_802E1BD0, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
func_8038A978();
func_802E1CB8(actor->position, 0xC);
@@ -221,7 +221,7 @@ void func_802E20E8(Actor *this){
animctrl_setAnimTimer(this->animctrl, randf());
func_8032BC18(this);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
local->unk0 = func_80326EEC(0x336)->marker;
local->unk0 = actorArray_findActorFromActorId(0x336)->marker;
func_8038A990();
}
}//L802E21D8
@@ -309,7 +309,7 @@ void func_802E20E8(Actor *this){
&& local->unkB
){
func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
__spawnqueue_add_1((GenMethod_1)func_802E1B24, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_802E1B24, (s32)this->marker);
local->unk9 = FALSE;
}

34
src/core2/ch/gameSelect.c
View File

@@ -21,9 +21,11 @@ extern void func_8031FB14(s32, s32);
extern void func_8031F678(s32, s32);
extern void func_80335110(s32);
extern void func_8024E60C(s32, f32*);
extern void func_8024E60C(s32, s32[3]);
extern void func_8024E71C(s32, f32*);
extern char *gcpausemenu_TimeToA(int);
extern struct5Bs *func_803097A0(void);
/* .data */
f32 D_80365DD0[3][3] = {
@@ -88,7 +90,7 @@ gczoombox_t *D_8037DCF0;
gczoombox_t *D_8037DCF4;
f32 D_8037DCF8[2][3];
f32 D_8037DD10[2][3];
void *D_8037DD28;
s32 D_8037DD28;
s32 D_8037DD2C;
f32 D_8037DD30;
f32 D_8037DD34;
@@ -286,7 +288,7 @@ void func_802C4C14(Actor *this){
f32 sp54;
f32 sp50;
int i; //sp4C
s32 sp48;
struct5Bs *sp48;
f32 sp44;
s32 tmp_a2_2;
f32 sp34[3];
@@ -298,7 +300,7 @@ void func_802C4C14(Actor *this){
return;
if(!this->initialized){
__spawnqueue_add_1(func_802C4BB4, this->marker);
__spawnQueue_add_1((GenMethod_1)func_802C4BB4, reinterpret_cast(s32, this->marker));
func_802C7318(this);
this->unk130 = func_802C71F0;
if(sp84 == 0){
@@ -348,7 +350,7 @@ void func_802C4C14(Actor *this){
case 1://L802C4F10
if(sp84 == 1){
func_8030E510(SFX_136_GAMEBOY_STARTUP, 15000);
timedFunc_set_3(0.25f, comusic_8025AB44, COMUSIC_73_GAMEBOY, -1, 2000);
timedFunc_set_3(0.25f, (GenMethod_3)comusic_8025AB44, COMUSIC_73_GAMEBOY, -1, 2000);
func_8025A58C(0, 2000);
}
else{
@@ -390,19 +392,19 @@ void func_802C4C14(Actor *this){
if(animctrl_isStopped(this->animctrl)){
func_802DEB80();
if(!func_8033D1BC(sp84)){
timedFunc_set_3(0.0f, func_802E4078, MAP_85_CS_SPIRAL_MOUNTAIN_3, 0, 1);
timedFunc_set_3(0.0f, (GenMethod_3)func_802E4078, MAP_85_CS_SPIRAL_MOUNTAIN_3, 0, 1);
}
else{//L802C511C
sp44 = 0.0f;
if(this->state == 4 && (sp84 == 0 || sp84 == 1))
sp44 = 0.25f;
if(func_802DA498() && func_8031FF1C(BKPROG_BD_ENTER_LAIR_CUTSCENE)){
timedFunc_set_2(sp44, func_8031FB14, 0, 0);
timedFunc_set_2(sp44, (GenMethod_2)func_8031FB14, 0, 0);
}
else{//L802C5188
timedFunc_set_2(sp44, func_8031F678, 0, 0);
timedFunc_set_2(sp44, (GenMethod_2)func_8031F678, 0, 0);
}//L802C51A0
timedFunc_set_1(sp44, func_80335110, 1);
timedFunc_set_1(sp44, (GenMethod_1)func_80335110, 1);
}//L802C51B8
this->state = 6;
}
@@ -426,17 +428,17 @@ void func_802C4C14(Actor *this){
case 0://L802C52B8
func_8030E510(SFX_31_BANJO_OHHWAAOOO, 28000);
func_8030E540(SFX_135_CARTOONY_SPRING);
timedFunc_set_2(0.4f, func_8030E510, SFX_13A_GLASS_BREAKING_7, 0x7fff);
timedFunc_set_2(0.9f, func_8030E510, SFX_150_PORCELAIN_CRASH, 0x7fff);
timedFunc_set_2(1.0f, func_8030E510, SFX_151_CAT_MEOW, 0x7fff);
timedFunc_set_2(0.4f, (GenMethod_2)func_8030E510, SFX_13A_GLASS_BREAKING_7, 0x7fff);
timedFunc_set_2(0.9f, (GenMethod_2)func_8030E510, SFX_150_PORCELAIN_CRASH, 0x7fff);
timedFunc_set_2(1.0f, (GenMethod_2)func_8030E510, SFX_151_CAT_MEOW, 0x7fff);
break;
case 1://L802C5320
timedFunc_set_2(0.4f, func_8030E510, SFX_31_BANJO_OHHWAAOOO, 28000);
timedFunc_set_2(0.2f, func_8030E510, SFX_E_SHOCKSPRING_BOING, 28000);
timedFunc_set_2(0.4f, (GenMethod_2)func_8030E510, SFX_31_BANJO_OHHWAAOOO, 28000);
timedFunc_set_2(0.2f, (GenMethod_2)func_8030E510, SFX_E_SHOCKSPRING_BOING, 28000);
func_8030E540(SFX_2D_KABOING);
break;
case 2://L802C5364
timedFunc_set_2(0.15f, func_8030E510, SFX_32_BANJO_EGHEE, 28000);
timedFunc_set_2(0.15f, (GenMethod_2)func_8030E510, SFX_32_BANJO_EGHEE, 28000);
func_8030E510(SFX_3F6_UNKNOWN, 28000);
func_8030E540(SFX_8F_SNOWBALL_FLYING);
break;
@@ -603,4 +605,4 @@ void func_802C5A3C(s32 arg0){
void func_802C5A48(void){
D_80365E00 = -1;
}
}

2
src/core2/ch/gloop.c
View File

@@ -83,7 +83,7 @@ void chgloop_update(Actor *this){
sp34[2] = this->position[2];
}
if(func_80329530(this, 1900)){
func_802C3F04(chgloop_spawnBubble, reinterpret_cast(s32, sp34[0]), reinterpret_cast(s32, sp34[1]), reinterpret_cast(s32, sp34[2]), reinterpret_cast(s32, this->yaw));
__spawnQueue_add_4(chgloop_spawnBubble, reinterpret_cast(s32, sp34[0]), reinterpret_cast(s32, sp34[1]), reinterpret_cast(s32, sp34[2]), reinterpret_cast(s32, this->yaw));
}
func_8030E9C4(SFX_3ED, randf()/2 + 0.6, 32000, this->position, 100.0f, 3000.0f);

4
src/core2/ch/icecube.c
View File

@@ -5,10 +5,12 @@
#define _HorzDist3v(v1, v2) ((v1[0]-v2[0])*(v1[0]-v2[0]) + (v1[2]-v2[2])*(v1[2]-v2[2]))
extern void func_802D729C(Actor *, f32);
extern f32 func_80257204(f32, f32, f32, f32);
extern Actor *func_802C937C(enum actor_e, f32[3]);
void chicecube_update(Actor *this);
Actor *chicecube_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_80372B50[] = {
{0x000, 0.0f},
@@ -224,7 +226,7 @@ void __chicecube_die(ActorMarker *marker, ActorMarker *other_marker){
func_8035A04C(actor->position, 12, ASSET_505_MODEL_ICECUBE_CHUNK, actor->scale);
func_8035A228(actor->position, 6, ASSET_700_SPRITE_DUST, actor->scale);
if(actor->unkF4_8 != 1){
__spawnqueue_add_1(__chicecube_spawnHalfCubes, actor->marker);
__spawnQueue_add_1((GenMethod_1)__chicecube_spawnHalfCubes, reinterpret_cast(s32, actor->marker));
}
marker_despawn(actor->marker);
}

46
src/core2/ch/jiggy.c
View File

@@ -14,10 +14,10 @@ typedef struct chjiggy_s{
Actor *func_802C41D8(f32, f32, f32);
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3);
Actor *func_802C7D0C(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_802C7D98(Actor * arg0);
void func_802C7DC0(Actor *this);
int func_802C8088(Actor *this);
void chjiggy_update(Actor *this);
enum jiggy_e chjiggy_getJiggyId(Actor *this);
@@ -31,7 +31,7 @@ ActorAnimationInfo D_80366290[] = {
ActorInfo D_803662A8 = {
0x52, ACTOR_46_JIGGY, ASSET_35F_MODEL_JIGGY,
1, D_80366290,
func_802C7DC0, func_802C7D98, func_802C7D0C,
chjiggy_update, func_802C7D98, chjiggy_draw,
0, 0, 0.9f, 0
};
@@ -62,8 +62,8 @@ void func_802C7AB0(ActorMarker * arg0, u32 arg1){
}
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3){
func_802C3F04((GenMethod_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z);
func_802C3F04((GenMethod_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
__spawnQueue_add_4((GenMethod_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenMethod_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
mapSpecificFlags_set(arg3, 1);
}
@@ -80,16 +80,15 @@ void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5
actor_collisionOff(this);
func_802BAFE4(arg3);
func_80356520(arg6);
timedFunc_set_4(0.6f, (TFQM4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (TFQM2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (TFQM0)func_802BE720);
timedFunc_set_4(0.6f, (GenMethod_4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (GenMethod_2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (GenMethod_0)func_802BE720);
timedFunc_set_1(3.9f, (GenMethod_1)func_802C7B6C, arg4);
mapSpecificFlags_set(arg1, 1);
}
}
//chjiggy_updateRotate
void func_802C7CA4(Actor *this){
void chjiggy_updateRotation(Actor *this){
f32 delta = time_getDelta();
this->yaw += delta * 230.0f;
if(360.0f <= this->yaw){
@@ -99,13 +98,13 @@ void func_802C7CA4(Actor *this){
}
//chjiggy_draw
Actor *func_802C7D0C(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor * thisActor = marker_getActor(this);
ActorLocal_Jiggy *local = (ActorLocal_Jiggy *)&thisActor->local;
u32 jiggyId;
if(!local->unk0){
jiggyId = func_802C8088(thisActor);
jiggyId = chjiggy_getJiggyId(thisActor);
if((jiggyId == JIGGY_1C_CC_RINGS) || (jiggyId == JIGGY_1D_CC_SLOW_SAWBLADES)){
func_8033A280(10.0f);
func_8033A244(30000.0f);
@@ -117,11 +116,11 @@ Actor *func_802C7D0C(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
void func_802C7D98(Actor * arg0){
func_80343DEC(arg0);
func_802C7CA4(arg0);
chjiggy_updateRotation(arg0);
}
//chjiggy_update
void func_802C7DC0(Actor *this){
void chjiggy_update(Actor *this){
ActorLocal_Jiggy *local = (ActorLocal_Jiggy *)&this->local;
int i;
@@ -144,7 +143,7 @@ void func_802C7DC0(Actor *this){
}
else{
func_80328A84(this, 2);
switch(func_802C8088(this)){
switch(chjiggy_getJiggyId(this)){
case JIGGY_17_CC_CLANKER_RAISED: //L802C7EF8
case JIGGY_49_CCW_EYRIE:// L802C7EF8
this->marker->unk40_21 = 1;
@@ -156,7 +155,7 @@ void func_802C7DC0(Actor *this){
this->marker->unk2C_2 = 1;
this->unk54 = 0.0f;
func_80343DEC(this);
func_802C7CA4(this);
chjiggy_updateRotation(this);
break;
case JIGGY_3E_GV_GRABBA:// L802C7F6C
case JIGGY_4D_CCW_FLOWER:// L802C7F6C
@@ -172,8 +171,8 @@ void func_802C7DC0(Actor *this){
}
break;
case 2: //L802C7FAC
func_802C7CA4(this);
switch(func_802C8088(this)){
chjiggy_updateRotation(this);
switch(chjiggy_getJiggyId(this)){
case JIGGY_20_BGS_ELEVATED_WALKWAY: //L802C7FE8
func_802C7B8C(this, 4, 3, 0xD, 5, 2, 0xae);
break;
@@ -191,21 +190,18 @@ void func_802C7DC0(Actor *this){
}//L802C8074
}
//chjiggy_getId
int func_802C8088(Actor *this){
enum jiggy_e chjiggy_getJiggyId(Actor *this){
ActorLocal_Jiggy *local = (ActorLocal_Jiggy *)&this->local;
return local->index;
}
void func_802C8090(Actor * this){
void chjiggy_hide(Actor * this){
ActorLocal_Jiggy *local = (ActorLocal_Jiggy *)&this->local;
local->unk0 = 1;
actor_collisionOff(this);
}
//chjiggy_setId
void func_802C80B4(Actor *this, u32 id){
void chjiggy_setJiggyId(Actor *this, u32 id){
ActorLocal_Jiggy *local = (ActorLocal_Jiggy *)&this->local;
local->index = id;
}

3
src/core2/ch/jigsawdance.c
View File

@@ -3,6 +3,7 @@
#include "variables.h"
extern f32 func_8028EBA4();
AnimCtrl *player_getAnimCtrlPtr(void);
Actor *func_802C80C0(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_802C811C(Actor * this);
@@ -38,7 +39,7 @@ Actor *func_802C80C0(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
}
void func_802C811C(Actor * this){
ActorAnimCtrl *plyrMvmt;
AnimCtrl *plyrMvmt;
this->marker->collidable = 0;
switch(this->state){

21
src/core2/ch/mole.c
View File

@@ -293,8 +293,9 @@ void func_802D9CBC(Actor *this){
void func_802D9D60(Actor *this){
s32 sp50[6];
f32 sp4C;
f32 pad44[2];
f32 pad44[1];
Actor *other;
NodeProp *node_prop;
f32 sp34[3];
if(this->unkF4_8 < 8 || this->unkF4_8 >= 0x13)
@@ -304,7 +305,7 @@ void func_802D9D60(Actor *this){
this->unk16C_4 = 1;
func_803300D8(this->marker, func_802D9C90);
if(this->initialized){
other = func_80326D68(this->position, ACTOR_12C_MOLEHILL, -1, &sp4C);
other = actorArray_findClosestActorFromActorId(this->position, ACTOR_12C_MOLEHILL, -1, &sp4C);
this->unk100 = (other) ? other->marker : NULL;
if(this->unk100){
other = subaddie_getLinkedActor(this);
@@ -316,29 +317,29 @@ void func_802D9D60(Actor *this){
}//L802D9E34
if(!this->initialized){
other = func_80304C38(0x372, this);
if(other == NULL){
node_prop = func_80304C38(0x372, this);
if(node_prop == NULL){
this->unk38_0 = FALSE;
}
else{
this->unk38_0 = TRUE;
nodeprop_getPosition(other, this->unk1C);
nodeprop_getPosition(node_prop, this->unk1C);
}
__spawnqueue_add_1(func_802D9C54, this->marker);
__spawnQueue_add_1((GenMethod_1)func_802D9C54, reinterpret_cast(s32, this->marker));
this->marker->propPtr->unk8_3 = FALSE;
this->marker->collidable = FALSE;
this->initialized = TRUE;
if(this->unkF4_8 == 0x12){
other = func_80304C38(0x349, this);
if(other == NULL){
node_prop = func_80304C38(0x349, this);
if(node_prop == NULL){
this->velocity[0] = this->position[0];
this->velocity[1] = this->position[1];
this->velocity[2] = this->position[2];
this->unk28 = 500.0f;
}
else{ //L802D9F08
nodeprop_getPosition(other, this->velocity);
this->unk28 = 2*nodeprop_getRadius(other);
nodeprop_getPosition(node_prop, this->velocity);
this->unk28 = 2*nodeprop_getRadius(node_prop);
}
}
}//L802D9F34

2
src/core2/ch/soundsource.c
View File

@@ -115,7 +115,7 @@ void func_802D096C(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
}
void func_802D09B8(Actor *this, s32 arg1){
func_802C3F04(func_802D096C,
__spawnQueue_add_4((GenMethod_4)func_802D096C,
reinterpret_cast(s32, this->position[0]),
reinterpret_cast(s32, this->position[1]),
reinterpret_cast(s32, this->position[2]),

2
src/core2/code_11660.c
View File

@@ -84,4 +84,4 @@ void func_80298700(void){
else{
D_8037C5D0 = NULL;
}
}
}

2
src/core2/code_14420.c
View File

@@ -886,7 +886,7 @@ void func_8029CBC4(void){
void func_8029CBF4(void){
if(item_getCount(ITEM_E_JIGGY) == 10){
if( jiggyscore_total() == 100 && func_8031FF1C(BKPROG_FC_DEFEAT_GRUNTY)){
timedFunc_set_3(4.1f, (TFQM3)func_802E4078, MAP_95_CS_END_ALL_100, 0, 1);
timedFunc_set_3(4.1f, (GenMethod_3)func_802E4078, MAP_95_CS_END_ALL_100, 0, 1);
}//L8029CC58
timedFunc_set_0(4.0f, func_8029CBC4);

2
src/core2/code_16010.c
View File

@@ -55,7 +55,7 @@ void func_8029D154(void){
}
void func_8029D194(void) {
func_802C3BF8(&func_8029D154);
__spawnQueue_add_0(&func_8029D154);
FUNC_8030E624(SFX_A_BANJO_LANDING_05, 1.0f, 28000);
func_8030E394(D_8037D210);
sfxsource_setSfxId(D_8037D210, SFX_6D_CROC_BITE);

2
src/core2/code_171F0.c
View File

@@ -56,4 +56,4 @@ int func_8029E384(s32 arg0){
void func_8029E3C0(s32 arg0, f32 arg1){
D_8037D250.unk20[arg0] = arg1;
D_8037D250.unk0[arg0] = arg1;
}
}

2
src/core2/code_2240.c
View File

@@ -184,4 +184,4 @@ void anim_802897D4(Animation *this, BKAnimationList *arg0, Animation *dst){
void anim_8028980C(Animation *this){
this->unk1C = 2;
}
}

2
src/core2/code_33F90.c
View File

@@ -426,7 +426,7 @@ void func_802BAFE4(s32 arg0) {
temp_f0 = func_802BAFA0(arg0, phi_s1);
switch(D_803654B8[arg0][phi_s1 + 1]){
case -5:
timedFunc_set_6(temp_f0, (TFQM6) func_802BAF80, NULL);
timedFunc_set_6(temp_f0, (GenMethod_6) func_802BAF80, NULL);
phi_s0++;
break;

4
src/core2/code_34790.c
View File

@@ -116,7 +116,7 @@ void func_802BBA84(void) {
f32 sp30[3];
f32 sp24[3];
func_80309998(sp30, sp24);
mapModel_getBounds(sp30, sp24);
func_8024C5CC(sp54);
func_8024C764(sp3C);
func_8024C5A8(sp48);
@@ -356,7 +356,7 @@ void func_802BC2CC(s32 arg0) {
func_8024CD88(D_8037D908);
func_8024CE18(D_8037D918);
func_8024CFD4();
func_802C3D3C(func_802BC2A0, D_8037D908, D_8037D918);
__spawnQueue_add_2((GenMethod_2)func_802BC2A0, D_8037D908, D_8037D918);
if (D_8037D8C0 == 2) {
func_802BE720();
if (sp1C != 0x63) {

14
src/core2/code_3480.c
View File

@@ -24,20 +24,20 @@ void snacker_reset(void){
//__playerWithinHorizontalDistance
s32 func_8028A41C(f32 x, f32 z, f32 dist){
f32 plyrPos[3];
f32 player_position[3];
_player_getPosition(&plyrPos);
return func_80259254(plyrPos, x, z, dist);
_player_getPosition(player_position);
return func_80259254(player_position, x, z, dist);
}
//_snacker_ttc_update
s32 func_8028A45C(void){
s32 nextState = 0;
f32 plyrPos[3];
f32 player_position[3];
_player_getPosition(&plyrPos);
_player_getPosition(player_position);
if(func_8028B470() || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ //(swimming || ???)
if(plyrPos[1] < 600.0f
if(player_position[1] < 600.0f
&& !func_8028A41C(2478.0f, 4586.0f, 1750.0f) //within 1750 of sandcastle center
&& !func_8028A41C(-400.0, 2315.0f, 2000.0f) //within 2000 of blubber's ship center
){
@@ -141,4 +141,4 @@ void func_8028A8D0(void){
//snacker_getState
s32 func_8028A94C(void){
return D_8037BF50;
}
}

2
src/core2/code_37CD0.c
View File

@@ -17,7 +17,7 @@ void func_802BEC60(void) {
func_8024C5CC(D_8037DA50.unk0);
func_8024C764(D_8037DA50.unkC);
func_80309998(sp24, sp18);
mapModel_getBounds(sp24, sp18);
D_8037DA50.unk18[0] = (f32) sp24[0];
D_8037DA50.unk18[1] = (f32) sp24[1];

6
src/core2/code_3B5C0.c
View File

@@ -21,7 +21,7 @@ struct{
/* .code */
bool func_802C2550(void) {
return (ml_vec3f_distance(D_8037DC60.unk0, &D_8037DC60.unk18) < 40.0f);
return (ml_vec3f_distance(D_8037DC60.unk0, D_8037DC60.unk18) < 40.0f);
}
void func_802C2598(f32 arg0[3], f32 arg1[3]) {
@@ -57,8 +57,8 @@ void func_802C26D8(f32 arg0[3], f32 arg1[3]) {
if (!func_802C2550() && !func_8028F150()) {
func_8028FCC8(1);
}
ml_vec3f_copy(arg0, &D_8037DC60.unk0);
ml_vec3f_copy(arg1, &D_8037DC60.unkC);
ml_vec3f_copy(arg0, D_8037DC60.unk0);
ml_vec3f_copy(arg1, D_8037DC60.unkC);
}

8
src/core2/code_400F0.c
View File

@@ -186,7 +186,7 @@ void func_802C74F4(Actor *actor, s32 arg1, f32 arg2){
}
void func_802C7568(enum actor_e actor_id, s32 arg1, f32 arg2){
Actor *actor = func_80326EEC(actor_id);
Actor *actor = actorArray_findActorFromActorId(actor_id);
if(actor)
func_802C74F4(actor, arg1, arg2);
}
@@ -198,7 +198,7 @@ void func_802C75A0(Actor *actor, s32 arg1){
}
void func_802C75C8(enum actor_e actor_id, s32 arg1){
Actor *actor = func_80326EEC(actor_id);
Actor *actor = actorArray_findActorFromActorId(actor_id);
if(actor)
func_802C75A0(actor, arg1);
}
@@ -208,7 +208,7 @@ void func_802C75F8(Actor *actor, s32 arg1){
}
void func_802C7600(enum actor_e actor_id, s32 arg1){
Actor *actor = func_80326EEC(actor_id);
Actor *actor = actorArray_findActorFromActorId(actor_id);
if(actor)
func_802C75F8(actor, arg1);
}
@@ -345,4 +345,4 @@ void func_802C79C4(void){
mapSpecificFlags_set(i, FALSE);
}
}
}
}

2
src/core2/code_41460.c
View File

@@ -74,7 +74,7 @@ Actor *func_802C8484(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
u32 phi_v1;
s32 phi_s4;
sp58 = func_80325300(marker, &sp5C);
sp58 = marker_getActorAndRotation(marker, &sp5C);
temp_s1 = sp58->unk40;
phi_s4 = FALSE;
for(phi_s0 = temp_s1->begin; phi_s0 < temp_s1->current; phi_s0++){

4
src/core2/code_440B0.c
View File

@@ -181,7 +181,7 @@ void func_802CB7C0(ActorMarker *marker, ActorMarker *other){
sp3C = this->modelCacheIndex == 0xF2;
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900);
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900);
func_802C3F04(func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
this->unk60 = 5.0f;
marker->collidable = FALSE;
this->unk138_27 = 1;
@@ -191,7 +191,7 @@ void func_802CB7C0(ActorMarker *marker, ActorMarker *other){
) {
this->depth_mode = MODEL_RENDER_DEPTH_COMPARE;
if( !jiggyscore_isCollected(JIGGY_16_CC_SNIPPETS)
&& ((func_80326D68(this->position, 0xF5, -1, &sp44) == NULL) || (3000.0f < sp44))) {
&& ((actorArray_findClosestActorFromActorId(this->position, 0xF5, -1, &sp44) == NULL) || (3000.0f < sp44))) {
sp48[0] = 13814.0f;
sp48[1] = 3812.0f;
sp48[2] = 0.0f;

4
src/core2/code_47BD0.c
View File

@@ -322,7 +322,7 @@ void chBeeSwarm_update(Actor *this) {
sp78 = 0;
if (!this->initialized) {
this->initialized = TRUE;
beehive = func_80326D68(this->position, ACTOR_12_BEEHIVE, -1, &spB0);
beehive = actorArray_findClosestActorFromActorId(this->position, ACTOR_12_BEEHIVE, -1, &spB0);
this->unk100 = (beehive != NULL) ? beehive->marker : NULL;
if(500.0f < spB0){
this->unk100 = NULL;
@@ -360,7 +360,7 @@ void chBeeSwarm_update(Actor *this) {
actor_collisionOff(this);
local->unk20 = assetcache_get(ASSET_3BF_MODEL_PLAYER_SHADOW);
if (sp78 == 0) {
beehive = func_80326D68(this->position, ACTOR_12_BEEHIVE, -1, &spB0);
beehive = actorArray_findClosestActorFromActorId(this->position, ACTOR_12_BEEHIVE, -1, &spB0);
if (beehive != NULL) {
this->unk100 = beehive->marker;
} else {

20
src/core2/code_47C0.c
View File

@@ -166,7 +166,7 @@ void func_8028B9A8(s32 arg0){
}
void func_8028BA00(s32 arg0){
__spawnqueue_add_1(func_8028B9A8, arg0);
__spawnQueue_add_1((GenMethod_1)func_8028B9A8, arg0);
if(arg0);
}
@@ -239,7 +239,7 @@ void func_8028BCA0(Prop *prop){
Actor *actor; //0xb8
f32 spAC[3];
f32 spA0[3];
s32 sp9C;
s32 jiggy_id;
s32 sp98;
volatile s32 sp94;
s32 sp88[3]; //0
@@ -527,13 +527,13 @@ void func_8028BCA0(Prop *prop){
return;
player_getPosition(spA0);
sp9C = func_802C8088(actor);
if( sp9C != JIGGY_2F_FP_XMAS_TREE
jiggy_id = chjiggy_getJiggyId(actor);
if( jiggy_id != JIGGY_2F_FP_XMAS_TREE
|| (func_8028B2E8() && !(3600.0f < ml_vec3f_distance_squared(actor->position, spA0)))
){
jiggyscore_setCollected(sp9C, 1);
jiggyscore_setCollected(jiggy_id, TRUE);
func_803463F4(ITEM_26_JIGGY_TOTAL, 1);
if(sp9C == JIGGY_20_BGS_ELEVATED_WALKWAY || sp9C == JIGGY_25_BGS_MAZE){
if(jiggy_id == JIGGY_20_BGS_ELEVATED_WALKWAY || jiggy_id == JIGGY_25_BGS_MAZE){
func_802D6924();
}
if(jiggyscore_total() < 3){
@@ -544,7 +544,7 @@ void func_8028BCA0(Prop *prop){
func_8028B8DC();
}
func_802C3F04(func_8028B904, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z), sp9C);
__spawnQueue_add_4((GenMethod_4)func_8028B904, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z), jiggy_id);
marker_despawn(marker);
}
}
@@ -574,7 +574,7 @@ void func_8028BCA0(Prop *prop){
case 0x54: //L8028C820
func_8025A6EC(COMUSIC_19_LOW_PITCH_FLUTES, 28000);
func_803012F8();
func_802C3F04(func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
__spawnQueue_add_4((GenMethod_4)func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
marker_despawn(marker);
break;
@@ -747,7 +747,7 @@ void func_8028BCA0(Prop *prop){
miscflag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
func_802A6388(chwadingboots_802D6E4C(actor));
bs_checkInterrupt(BS_INTR_1B);
func_802C3F04(func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
__spawnQueue_add_4((GenMethod_4)func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
chwadingboots_802D6E54(actor);
break;
@@ -771,7 +771,7 @@ void func_8028BCA0(Prop *prop){
miscflag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_80294AE8(chtrainers_802CA748(actor));
bs_checkInterrupt(BS_INTR_1A);
func_802C3F04(func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
__spawnQueue_add_4((GenMethod_4)func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
chtrainers_802CA750(actor);
break;

2
src/core2/code_49A70.c
View File

@@ -121,7 +121,7 @@ void func_802D0F30(ActorMarker *marker, ActorMarker *other_marker) {
this = marker_getActor(marker);
FUNC_8030E8B4(SFX_1B_EXPLOSION_1, 1.0f, 32736, this->position, 1250, 2500);
__spawnqueue_add_1((GenMethod_1)func_802D0B24, reinterpret_cast(s32, this));
__spawnQueue_add_1((GenMethod_1)func_802D0B24, reinterpret_cast(s32, this));
func_802D0B54(this);
func_802D0CB4(this);
func_802D0DDC(this, ASSET_53A_MODEL_SHRAPNAL_PIECE_EYE, 2);

54
src/core2/code_4C020.c
View File

@@ -554,7 +554,7 @@ void func_802D4614(enum map_e map_id){
D_803676AC = TRUE;
func_8028F918(2);
func_8025A788(COMUSIC_69_FF_WARP, 0.0f, 1.7f);
timedFunc_set_2(1.0f, (TFQM2) func_8031CC40, map_id, 2);
timedFunc_set_2(1.0f, (GenMethod_2) func_8031CC40, map_id, 2);
}
void func_802D4680(Actor *this){
@@ -707,44 +707,44 @@ void func_802D4CD4(Actor *this){
func_802D4AC0(this, 0x4000bb, 0x47);
}
void func_802D4D3C(s32 arg0, s32 arg1) {
s32 sp5C[3];
void func_802D4D3C(enum actor_e arg0, enum actor_e arg1) {
f32 sp5C[3];
s32 sp4C[4];
f32 sp40[3];
if (func_80304E24(arg1, &sp5C)) {
func_803331D8(arg0, &sp5C);
if (func_80304E24(arg1, sp5C)) {
func_803331D8(arg0, sp5C);
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
if (arg0 == 0x36) {
sp4C[3] = 200;
sp4C[0] = sp4C[1] = sp4C[2] = 180;\
ml_vec3f_assign(&sp40, 0.0f, 0.0f, 0.0f);
func_802EE6CC(&sp5C, &sp40, &sp4C, 0, 6.0f, 200.0f, 200, 100, 0);
ml_vec3f_assign(sp40, 0.0f, 0.0f, 0.0f);
func_802EE6CC(sp5C, sp40, sp4C, 0, 6.0f, 200.0f, 200, 100, 0);
sp4C[3] = 230;
sp4C[0] = sp4C[1] = sp4C[2] = 150;
ml_vec3f_assign(&sp40, 0.0f, 2.0f, 0.0f);
func_802EE6CC(&sp5C, &sp40, &sp4C, 0, 2.0f, 90.0f, 50, 33, 0);
ml_vec3f_assign(sp40, 0.0f, 2.0f, 0.0f);
func_802EE6CC(sp5C, sp40, sp4C, 0, 2.0f, 90.0f, 50, 33, 0);
sp4C[3] = 150;
sp4C[0] = sp4C[1] = sp4C[2] = 230;
ml_vec3f_assign(&sp40, -3.0f, 1.0f, 1.0f);
func_802EE6CC(&sp5C, &sp40, &sp4C, 0, 3.5f, 130.0f, 100, 80, 0);
ml_vec3f_assign(sp40, -3.0f, 1.0f, 1.0f);
func_802EE6CC(sp5C, sp40, sp4C, 0, 3.5f, 130.0f, 100, 80, 0);
sp4C[3] = 200;
sp4C[0] = sp4C[1] = sp4C[2] = 250;
ml_vec3f_assign(&sp40, -1.0f, 3.0f, -3.0f);
func_802EE6CC(&sp5C, &sp40, &sp4C, 0, 2.4f, 40.0f, 10, 120, 0);
ml_vec3f_assign(sp40, -1.0f, 3.0f, -3.0f);
func_802EE6CC(sp5C, sp40, sp4C, 0, 2.4f, 40.0f, 10, 120, 0);
sp4C[3] = 130;
sp4C[0] = sp4C[1] = sp4C[2] = 130;
ml_vec3f_assign(&sp40, 2.0f, -2.0f, 2.0f);
func_802EE6CC(&sp5C, &sp40, &sp4C, 0, 4.7f, 180.0f, 20, 160, 0);
ml_vec3f_assign(sp40, 2.0f, -2.0f, 2.0f);
func_802EE6CC(sp5C, sp40, sp4C, 0, 4.7f, 180.0f, 20, 160, 0);
func_8030E6D4(SFX_1B_EXPLOSION_1);
}
else{
func_802C3F04(func_802C4140, 0x4C,
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp5C[0]),
reinterpret_cast(s32, sp5C[1]),
reinterpret_cast(s32, sp5C[2])
@@ -775,7 +775,7 @@ void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) {
D_8036769C = 0;
D_803676A0 = 0;
if (map_id != D_80367694) {
timedFunc_set_1(0.25f, func_802D5000, map_id);
timedFunc_set_1(0.25f, (GenMethod_1)func_802D5000, map_id);
} else {
timedFunc_set_0(0.25f, func_802D63D4);
}
@@ -913,21 +913,21 @@ void func_802D5628(void){
switch(D_8036768C){
case 0x1: // L802D57C8
if(!D_80367690){
timedFunc_set_2(0.4f, (TFQM2) func_802D4D3C, 0x34, 0x205);
timedFunc_set_2(0.4f, (GenMethod_2) func_802D4D3C, 0x34, 0x205);
D_80367690++;
}
break;
case 0x2: // L802D5808
if(!D_80367690){
timedFunc_set_2(0.4f, (TFQM2) func_802D4D3C, 0x39, 0x207);
timedFunc_set_2(0.4f, (GenMethod_2) func_802D4D3C, 0x39, 0x207);
D_80367690++;
}
break;
case 0x3: // L802D5848
if(!D_80367690){
timedFunc_set_2(0.4f, (TFQM2) func_802D4D3C, 0x36, 0x20a);
timedFunc_set_2(0.4f, (GenMethod_2) func_802D4D3C, 0x36, 0x20a);
D_80367690++;
}
break;
@@ -935,14 +935,14 @@ void func_802D5628(void){
case 0x4: // L802D5888
func_802D5260();
if(!D_80367690){
timedFunc_set_2(0.4f, (TFQM2) func_802D4D3C, 0x3b, 0x20c);
timedFunc_set_2(0.4f, (GenMethod_2) func_802D4D3C, 0x3b, 0x20c);
D_80367690++;
}
break;
case 0x12: // L802D58D0
if(!D_80367690){
timedFunc_set_2(0.4f, (TFQM2) func_802D4D3C, 0x3c, 0x238);
timedFunc_set_2(0.4f, (GenMethod_2) func_802D4D3C, 0x3c, 0x238);
D_80367690++;
}
break;
@@ -1217,13 +1217,13 @@ void func_802D6494(void){
break;
case ACTOR_212_IRON_BARS:// L802D6550
if(map_get() == MAP_70_GL_CC_LOBBY && !func_803203FC(UNKFLAGS1_7F_SANDCASTLE_OPEN_CC)){
func_802D4830(func_80326EEC(ACTOR_212_IRON_BARS), SFX_9A_MECHANICAL_CLOSING, 0.5f);
func_802D4830(actorArray_findActorFromActorId(ACTOR_212_IRON_BARS), SFX_9A_MECHANICAL_CLOSING, 0.5f);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
case ACTOR_234_CCW_ENTRANCE_DOOR:// L802D65A0
if(map_get() == MAP_79_GL_CCW_LOBBY && !func_803203FC(UNKFLAGS1_93_SANDCASTLE_OPEN_CCW)){
func_802D485C(func_80326EEC(ACTOR_234_CCW_ENTRANCE_DOOR), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
func_802D485C(actorArray_findActorFromActorId(ACTOR_234_CCW_ENTRANCE_DOOR), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
@@ -1235,13 +1235,13 @@ void func_802D6494(void){
break;
case ACTOR_235_FP_ENTANCE_DOOR:// L802D6624
if(map_get() == MAP_6F_GL_FP_LOBBY && !func_803203FC(UNKFLAGS1_8B_SANDCASTLE_OPEN_FP)){
func_802D4830(func_80326EEC(ACTOR_235_FP_ENTANCE_DOOR), SFX_18_BIGBUTT_SLIDE, 0.5f);
func_802D4830(actorArray_findActorFromActorId(ACTOR_235_FP_ENTANCE_DOOR), SFX_18_BIGBUTT_SLIDE, 0.5f);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
case ACTOR_226_GV_ENTRANCE:// L802D6674
if(map_get() == MAP_6E_GL_GV_LOBBY && !func_803203FC(UNKFLAGS1_87_SANDCASTLE_OPEN_GV)){
func_802D485C(func_80326EEC(ACTOR_226_GV_ENTRANCE), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
func_802D485C(actorArray_findActorFromActorId(ACTOR_226_GV_ENTRANCE), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
@@ -1253,7 +1253,7 @@ void func_802D6494(void){
break;
case ACTOR_20F_RBB_ENTRANCE_DOOR:// L802D66F8
if(map_get() == MAP_77_GL_RBB_LOBBY && !func_803203FC(UNKFLAGS1_90_SANDCASTLE_OPEN_RBB)){
func_802D4830(func_80326EEC(ACTOR_20F_RBB_ENTRANCE_DOOR), SFX_9A_MECHANICAL_CLOSING, 0.5f);
func_802D4830(actorArray_findActorFromActorId(ACTOR_20F_RBB_ENTRANCE_DOOR), SFX_9A_MECHANICAL_CLOSING, 0.5f);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;

6
src/core2/code_51950.c
View File

@@ -52,7 +52,7 @@ void func_802D88E0(Actor *this) {
for(i = 0; i < 3; i++){
sp5C[i] = this->position[i] + (randf()*2)*25 - ((i == 1) ? 0 : 25);
}
particleEmitter_setPosition(pCtrl, &sp5C);
particleEmitter_setPosition(pCtrl, sp5C);
particleEmitter_setSprite(pCtrl, (this->modelCacheIndex == 0x1FF) ? ASSET_715_SPRITE_SPARKLE_RED : ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setStartingFrameRange(pCtrl, 0, 0);
func_802EFB98(pCtrl, &D_80367CD8);
@@ -89,5 +89,5 @@ void func_802D8B20(enum actor_e actor_id){
}
void func_802D8BE4(bool gold_feather){
__spawnqueue_add_1(func_802D8B20, (!gold_feather) ? 0x1FF : 0x200);
}
__spawnQueue_add_1((GenMethod_1)func_802D8B20, (!gold_feather) ? 0x1FF : 0x200);
}

2
src/core2/code_55390.c
View File

@@ -84,7 +84,7 @@ void func_802DC4C4(void) {
void func_802DC528(NodeProp *arg0, ActorMarker *arg1){
if(D_8037DE40 == NULL){
func_802C3BF8(func_802DC4C4);
__spawnQueue_add_0(func_802DC4C4);
}
}

2
src/core2/code_556C0.c
View File

@@ -47,7 +47,7 @@ void func_802DC6E4(void) {
void func_802DC748(s32 arg0, s32 arg1){
if(D_8037DE50 == NULL){
func_802C3BF8(func_802DC6E4);
__spawnQueue_add_0(func_802DC6E4);
}
}

2
src/core2/code_55850.c
View File

@@ -76,7 +76,7 @@ void func_802DC960(void) {
void func_802DC9A4(s32 arg0, s32 arg1){
if(D_8037DE60 == NULL){
func_802C3BF8(func_802DC960);
__spawnQueue_add_0(func_802DC960);
}
}

2
src/core2/code_55A90.c
View File

@@ -41,7 +41,7 @@ void func_802DCA90(void) {
void func_802DCAD4(s32 arg0, s32 arg1){
if(D_8037DE70 == NULL){
func_802C3BF8(func_802DCA90);
__spawnQueue_add_0(func_802DCA90);
}
}

2
src/core2/code_55BC0.c
View File

@@ -91,7 +91,7 @@ void func_802DCD34(void){
void func_802DCD78(s32 arg0, s32 arg1){
if(D_8037DE80 == NULL){
func_802C3BF8(func_802DCD34);
__spawnQueue_add_0(func_802DCD34);
}
}

2
src/core2/code_55E70.c
View File

@@ -79,7 +79,7 @@ void func_802DCFC4(void){
void func_802DD008(s32 arg0, s32 arg1){
if(D_8037DE90 == NULL){
func_802C3BF8(func_802DCFC4);
__spawnQueue_add_0(func_802DCFC4);
}
}

2
src/core2/code_560F0.c
View File

@@ -555,7 +555,7 @@ void func_802DE9C8(void){
void func_802DEA18(s32 arg0, s32 arg1){
if(D_8037DEA0 == NULL){
func_802C3BF8(func_802DE9C8);
__spawnQueue_add_0(func_802DE9C8);
}
}

2
src/core2/code_57C70.c
View File

@@ -163,7 +163,7 @@ void func_802DF04C(void){
void func_802DF090(s32 arg0, s32 arg1){
if(D_8037DFE0 == NULL){
func_802C3BF8(func_802DF04C);
__spawnQueue_add_0(func_802DF04C);
}
}

2
src/core2/code_584D0.c
View File

@@ -145,7 +145,7 @@ void func_802DF71C(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *this;
f32 sp3C;
this = func_80325300(D_8037E060, &sp44);
this = marker_getActorAndRotation(D_8037E060, &sp44);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)D_8037E060);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);

2
src/core2/code_59780.c
View File

@@ -88,7 +88,7 @@ Actor *func_802E0738(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp34[3];
Actor *this;
this = func_80325300(marker, &sp34);
this = marker_getActorAndRotation(marker, &sp34);
modelRender_preDraw( (GenMethod_1)func_802E0710, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_draw(gfx, mtx, this->position, sp34, this->scale, NULL, func_80330B1C(marker));

2
src/core2/code_59A80.c
View File

@@ -44,7 +44,7 @@ s32 func_802E0A90(Actor *this){
sp18[0] = (s32)this->position[0];
sp18[1] = (s32)this->position[1];
sp18[2] = (s32)this->position[2];
id = func_80307164(sp18, this);
id = func_80307164(sp18);
if(id < 0){
return 0;
}

18
src/core2/code_59D40.c
View File

@@ -14,7 +14,7 @@ typedef struct {
}ActorLocal_core2_59D40;
void func_802E1168(Actor *this);
void chsnacker_update(Actor *this);
/* .data */
ActorAnimationInfo D_803685D0[] ={
@@ -33,7 +33,7 @@ ActorAnimationInfo D_803685D0[] ={
ActorInfo D_80368620 = {
0x14, 0x68, 0x3B0,
0x1, D_803685D0,
func_802E1168, func_80326224, func_80325888,
chsnacker_update, func_80326224, func_80325888,
0, 0, 0.0f, 0
};
@@ -157,11 +157,11 @@ f32 func_802E10F0(f32 arg0) {
return arg0;
}
void func_802E1168(Actor *this) {
void chsnacker_update(Actor *this) {
f32 sp5C;
ActorLocal_core2_59D40 *local;
s32 sp54;
f32 sp48[3];
f32 player_position[3];
f32 sp44;
f32 sp40;
s32 tmp;
@@ -176,7 +176,7 @@ void func_802E1168(Actor *this) {
this->unk154 = 0x085E0000;
marker_setCollisionScripts(this->marker, func_802E1050, func_802E1010, func_802E0F60);
}
_player_getPosition(&sp48);
_player_getPosition(player_position);
sp54 = func_8028A94C();
if(func_802E0DC0(this->position) || ((sp54 != 1) && (sp54 != 2))) {
@@ -354,10 +354,10 @@ void func_802E17E8(void) {
return;
}
if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) == 0) {
func_8032BB88(snacker, 0x1388, 0x2EE);
func_8032BB88(snacker, 5000, 750);
func_8024BD08(0);
func_8025A6EC(0x34, 0);
comusic_8025AB44(0x34, 0x7FFF, 0x2EE);
comusic_8025AB44(COMUSIC_34_SNACKER_DANGER, 0x7FFF, 750);
func_8024BD08(1);
}
D_8037E624 = 0.0f;
@@ -370,7 +370,7 @@ void func_802E1A04(s32 nextState) {
sp1C = time_getDelta();
if( getGameMode() == GAME_MODE_A_SNS_PICTURE
|| getGameMode() == 5
|| getGameMode() == GAME_MODE_5_UNKNOWN
|| getGameMode() == GAME_MODE_6_FILE_PLAYBACK
){
return;
@@ -379,7 +379,7 @@ void func_802E1A04(s32 nextState) {
if ((D_8037E620 == NULL)) {
D_8037E624 += sp1C;
if ((D_8037E628 < D_8037E624) && (nextState != 0)) {
func_802C3BF8(func_802E17E8);
__spawnQueue_add_0(func_802E17E8);
D_8037E628 = 1.0f;
}
}

2
src/core2/code_5BEB0.c
View File

@@ -37,7 +37,7 @@ void mapSavestate_defrag_all(void){
int i;
for(i = 0; i < 0x9A; i++){
if(D_8037E650[i]){
D_8037E650[i] = defrag(D_8037E650[i]);
D_8037E650[i] = (MapSavestate *)defrag(D_8037E650[i]);
}
}
}

7
src/core2/code_5C870.c
View File

@@ -22,8 +22,7 @@ extern void func_8030ED0C(void);
extern void func_80259BD0(void);
enum transition_e {
TRANSITION_0_NONE,
TRANSITION_0_NONE
};
void func_802E3BD0(s32 frame_buffer_indx);
@@ -594,8 +593,8 @@ s32 func_802E48D8(void){
func_802F0E58();
mapModel_defrag();
func_803086B4();
func_8032AF94();
func_802C4320();
actorArray_defrag();
spawnQueue_defrag();
func_802F3300();
func_802F542C();
gcdialog_defrag();

6
src/core2/code_654C0.c
View File

@@ -19,8 +19,7 @@ Vtx *vtxList_getVertices(BKVertexList *vtxList){
return &vtxList->vtx_18[0];
}
//vtxList_getBoundingBox_i
void func_802EC458(BKVertexList *vtxList, s32 min[3], s32 max[3]){
void vtxList_getBounds_s32(BKVertexList *vtxList, s32 min[3], s32 max[3]){
min[0] = vtxList->minCoord_0[0];
min[1] = vtxList->minCoord_0[1];
min[2] = vtxList->minCoord_0[2];
@@ -30,8 +29,7 @@ void func_802EC458(BKVertexList *vtxList, s32 min[3], s32 max[3]){
max[2] = vtxList->maxCoord_6[2];
}
//vtxList_getBoundingBox_f
void func_802EC48C(BKVertexList *vtxList, f32 min[3], f32 max[3]){
void vtxList_getBounds_f32(BKVertexList *vtxList, f32 min[3], f32 max[3]){
min[0] = (f32) vtxList->minCoord_0[0];
min[1] = (f32) vtxList->minCoord_0[1];
min[2] = (f32) vtxList->minCoord_0[2];

8
src/core2/code_6B030.c
View File

@@ -80,7 +80,7 @@ void func_802F1FC0(Struct65s *self, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
spBC = (s32) ((f32)self->unk20 * (1.0f + temp_f2));
temp_s5 = (s32) ((f32)self->unk20 * ((1.0f - (self->unk25 / 255.0f)) + ((self->unk25 / 255.0f) - temp_f2)));
func_80251BCC(&D_80380A18);
func_8025235C(&spD0, &spD0);
func_8025235C(spD0, spD0);
spD0[0] = (-297.0f * spD0[0]) / spD0[2];
spD0[1] = (297.0f * spD0[1]) / spD0[2];
spC4 = (s32) (spD0[0] + (f32) (framebuffer_width / 2));
@@ -377,17 +377,17 @@ void func_802F2FCC(Struct64s *arg0, f32 arg1[3], s16 arg2, f32 arg3, ActorMarker
}
}
void func_802F32C4(s32 arg0, f32 arg1[3], f32 arg2, ActorMarker *arg3, void(*arg4)(f32[3], f32, ActorMarker *)){
void func_802F32C4(Struct64s *arg0, f32 arg1[3], f32 arg2, ActorMarker *arg3, void(*arg4)(f32[3], f32, ActorMarker *)){
func_802F2FCC(arg0, arg1, 8, arg2, arg3, arg4);
}
void func_802F3300(void) {
if (!func_802559A0()) {
if (D_80380A10 != NULL) {
D_80380A10 = defrag(D_80380A10);
D_80380A10 = (f32 *)defrag(D_80380A10);
}
if (D_80368AB0 != NULL) {
D_80368AB0 = defrag(D_80368AB0);
D_80368AB0 = (Struct_core2_6B030_0 *)defrag(D_80368AB0);
}
}
}

2
src/core2/code_6B30.c
View File

@@ -133,7 +133,7 @@ void func_8028DE6C(enum actor_e actor_id){
func_802948F8(marker);
}
else{
__spawnqueue_add_1(func_8028DE0C, carriedObject_getActorID());
__spawnQueue_add_1((GenMethod_1)func_8028DE0C, carriedObject_getActorID());
}
}

2
src/core2/code_6C3E0.c
View File

@@ -6,6 +6,8 @@ extern bool func_8024549C(f32[3], f32);
extern void func_802EFAB0(ParticleEmitter *, s32, f32);
extern ParticleEmitter *func_802F3670(s16[3], f32, enum asset_e);
extern void func_802F0EAC(ParticleEmitter *, f32);
extern ParticleEmitter *func_802F0EF0(u8);
extern ParticleEmitter *func_802F3E98(f32 pos[3], enum asset_e sprite_id);
typedef struct {
f32 unk0[2];

2
src/core2/code_6D490.c
View File

@@ -230,4 +230,4 @@ void func_802F4978(Struct5Ds *this){
Struct5Ds *func_802F499C(Struct5Ds *this){
return (Struct5Ds *)defrag(this);
}
}

1
src/core2/code_7060.c
View File

@@ -950,6 +950,7 @@ void func_8028FCBC(void){
D_8037BFB8 = FALSE;
}
//player_setModelVisibile
void func_8028FCC8(bool arg0){
playerModel_setVisible(arg0);
}

2
src/core2/code_72B10.c
View File

@@ -266,4 +266,4 @@ void func_802FA508(void){
}
}
}
}
}

4
src/core2/code_76D90.c
View File

@@ -228,11 +228,11 @@ void func_802FE844(s32 arg0, struct8s *arg1){
D_803815E4 = 0;
D_803815E0 = 0.9999f;
func_803463D4(ITEM_13_EMPTY_HONEYCOMB, -6);
timedFunc_set_2(0.25f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(0.25f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_803463D4(ITEM_14_HEALTH, 0);
timedFunc_set_1(1.25f, (GenMethod_1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (GenMethod_1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_2(1.25f, (TFQM2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
timedFunc_set_2(1.25f, (GenMethod_2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
timedFunc_set_1(1.5f, (GenMethod_1)gcpausemenu_80314AC8, 1);
}
break;

30
src/core2/code_7AF80.c
View File

@@ -6,7 +6,7 @@
extern f32 ml_vec3f_distance_squared(f32[3], f32[3]);
extern f32 func_802586B0(f32[3], f32[3]);
extern void mapModel_getCubeBounds(s32 min[3], s32 max[3]);
extern f32 func_803243D0(struct56s *arg0, f32 arg1[3]);
extern void func_802CAF14(u32*, s32, bool);
extern void func_8032D510(Cube *, Gfx **, Mtx **, Vtx **);
@@ -453,9 +453,9 @@ void func_80302C94(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
func_8032D510(D_80381FA0.unk40, gfx, mtx, vtx);
}
if (((45.0f <= sp54[1]) && (sp54[1] <= 135.0f)) || ((225.0f <= sp54[1]) && (sp54[1] <= 315.0f))) {
func_80301F50(gfx, mtx, vtx, &sp60, &sp44, &sp38);
func_80301F50(gfx, mtx, vtx, sp60, sp44, sp38);
} else {
func_80302634(gfx, mtx, vtx, &sp60, &sp44, &sp38);
func_80302634(gfx, mtx, vtx, sp60, sp44, sp38);
}
func_80308D2C(gfx, mtx, vtx);
}
@@ -577,7 +577,7 @@ void * func_803036A0(f32 volume_p1[3], f32 volume_p2[3], f32 arg2[3], u32 arg3)
void *var_s5;
var_s5 = NULL;
cube_volumeToIndices(&min, &max, volume_p1, volume_p2, D_80381FA0.unk4);
cube_volumeToIndices(min, max, volume_p1, volume_p2, D_80381FA0.unk4);
for(cube_indx[2] = min[2]; cube_indx[2] <= max[2]; cube_indx[2]++){
for(cube_indx[1] = min[1]; cube_indx[1] <= max[1]; cube_indx[1]++){
for(cube_indx[0] = min[0]; cube_indx[0] <= max[0]; cube_indx[0]++){
@@ -602,7 +602,7 @@ void * func_80303800(f32 volume_p1[3], f32 volume_p2[3], f32 arg2[3], u32 arg3)
void *temp_v0;
void *var_s5;
cube_volumeToIndices(&min, &max, volume_p1, volume_p2, D_80381FA0.unk4);
cube_volumeToIndices(min, max, volume_p1, volume_p2, D_80381FA0.unk4);
for(cube_indx[0] = min[0]; cube_indx[0] <= max[0]; cube_indx[0]++){
for(cube_indx[1] = min[1]; cube_indx[1] <= max[1]; cube_indx[1]++){
for(cube_indx[2] = min[2]; cube_indx[2] <= max[2]; cube_indx[2]++){
@@ -786,7 +786,7 @@ void cubeList_init(void){
func_80303F38();
D_80381FA0.unk44 = 0;
func_803097AC(D_80381FA0.min, D_80381FA0.max);
mapModel_getCubeBounds(D_80381FA0.min, D_80381FA0.max);
D_80381FA0.unk2C = 0;
D_80381FA0.width[0] = D_80381FA0.max[0] - D_80381FA0.min[0] + 1;
D_80381FA0.width[1] = D_80381FA0.max[1] - D_80381FA0.min[1] + 1;
@@ -985,7 +985,7 @@ NodeProp *func_803049CC(enum actor_e actor_id, s32 arg1[3]) {
if (func_80305C30(sp7C[1] - D_80381FA0.min[1]) != 0) {
for(sp7C[0] = D_80381FA0.min[0]; sp7C[0] <= D_80381FA0.max[0] ; sp7C[0]++) {
for(sp7C[2] = D_80381FA0.min[2]; sp7C[2] <= D_80381FA0.max[2] ; sp7C[2]++) {
temp_v0 = func_8032E230(cube_atIndices(&sp7C), actor_id);
temp_v0 = func_8032E230(cube_atIndices(sp7C), actor_id);
if (temp_v0 != NULL) {
return temp_v0;
}
@@ -2142,7 +2142,7 @@ NodeProp *func_803080C8(s32 arg0) {
if(func_80305C30(sp3C[1] - D_80381FA0.min[1])){
for(sp3C[0] = D_80381FA0.min[0]; sp3C[0] <= D_80381FA0.max[0]; sp3C[0]++){
for(sp3C[2] = D_80381FA0.min[2]; sp3C[2] <= D_80381FA0.max[2]; sp3C[2]++){
temp_v0 = cube_atIndices(&sp3C);
temp_v0 = cube_atIndices(sp3C);
if (temp_v0 != NULL) {
for(var_v1 = 0; var_v1 < temp_v0->prop1Cnt; var_v1++){
if (arg0 == temp_v0->prop1Ptr[var_v1].unk10_31) {
@@ -2292,7 +2292,7 @@ void func_80308658(Struct_core2_7AF80_1 *arg0, s32 arg1) {
return;
for(i = arg0; i < arg0 + arg1; i++){
i->unk8 = defrag(i->unk8);
i->unk8 = (Struct_core2_7AF80_2 *)defrag(i->unk8);
}
}
@@ -2308,7 +2308,7 @@ void func_803086B4(void) {
if (cube->prop2Cnt != 0) {
if (cube->prop2Ptr != NULL) {
prop = cube->prop2Ptr;
cube->prop2Ptr = defrag(cube->prop2Ptr);
cube->prop2Ptr = (Prop *)defrag(cube->prop2Ptr);
if (prop != cube->prop2Ptr) {
func_80330104(cube);
phi_s1 -= 5;
@@ -2318,7 +2318,7 @@ void func_803086B4(void) {
if (cube->prop1Cnt != 0) {
if (cube->prop1Ptr != NULL) {
node = cube->prop1Ptr;
cube->prop1Ptr = defrag(cube->prop1Ptr);
cube->prop1Ptr = (NodeProp *)defrag(cube->prop1Ptr);
if (node != cube->prop1Ptr) {
phi_s1 -= 5;
}
@@ -2341,19 +2341,19 @@ void func_803086B4(void) {
}
if (D_8036A9BC != NULL) {
D_8036A9BC = defrag(D_8036A9BC);
D_8036A9BC = (Struct_core2_7AF80_1 *) defrag(D_8036A9BC);
}
if (D_8036A9C8 != NULL) {
D_8036A9C8 = defrag(D_8036A9C8);
D_8036A9C8 = (Struct_core2_7AF80_1 *) defrag(D_8036A9C8);
}
if (D_8036A9D4 != NULL) {
D_8036A9D4 = defrag(D_8036A9D4);
D_8036A9D4 = (Struct_core2_7AF80_1 *) defrag(D_8036A9D4);
}
if (sSpawnableActorList != NULL) {
sSpawnableActorList = defrag(sSpawnableActorList);
sSpawnableActorList = (ActorSpawn *)defrag(sSpawnableActorList);
}
} else {
func_80308658(D_8036A9BC, D_8036A9B8);

4
src/core2/code_83340.c
View File

@@ -202,8 +202,8 @@ void func_8030AA6C(void) {
BKModelBin *temp_a0;
s32 phi_s2;
D_80382394 = defrag(D_80382394);
D_80382390 = defrag(D_80382390);
D_80382394 = (struct_7AF80_1 *) defrag(D_80382394);
D_80382390 = (struct_7AF80_0 *) defrag(D_80382390);
if (!func_802559A0() && !func_80255AE4() && D_80382390 != NULL) {
for(phi_s2 = 0x14; (phi_s2 != 0) && !func_80255AE4(); phi_s2--){
D_8036B800++;

2
src/core2/code_91E10.c
View File

@@ -681,7 +681,7 @@ void func_8031A4CC(void) {
}
if (func_8031A3BC() == 0) {
D_803830E0->unkC = defrag(D_803830E0->unkC);
D_803830E0->unkC = (QuizQuestionBin *)defrag(D_803830E0->unkC);
}
D_803830E0 = (Struct_Core2_91E10 *)defrag(D_803830E0);
}

4
src/core2/code_935F0.c
View File

@@ -49,7 +49,7 @@ void func_8031A618(Actor *this) {
Actor *jiggy;
if (this->unk10_12 == MINIGAME_5_SANDCASTLE) {
jiggy = func_80326EEC(ACTOR_46_JIGGY);
jiggy = actorArray_findActorFromActorId(ACTOR_46_JIGGY);
if (jiggy != NULL) {
actor_collisionOff(jiggy);
jiggy->position[1] -= 1000.0f;
@@ -133,7 +133,7 @@ void func_8031A7F4(Actor *this, u32 arg1) {
func_8025A70C((func_803203FC(5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS);
func_802E4A70();
func_803204E4(0x21, TRUE);
timedFunc_set_3(2.0f, (TFQM3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1);
timedFunc_set_3(2.0f, (GenMethod_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1);
break;
}
func_80328A84(this, arg1);

6
src/core2/code_956B0.c
View File

@@ -63,8 +63,8 @@ bool func_8031C6E4(void) {
if (!mapSpecificFlags_get(0xC)) {
mapSpecificFlags_set(0xC, TRUE);
func_802DC528(0, 0);
timedFunc_set_2(11.0f, (TFQM2)func_802DC560, 0, 0);
timedFunc_set_3(12.0f, (TFQM3)func_802E4078, MAP_1F_CS_START_RAREWARE, 0, 1);
timedFunc_set_2(11.0f, (GenMethod_2)func_802DC560, 0, 0);
timedFunc_set_3(12.0f, (GenMethod_3)func_802E4078, MAP_1F_CS_START_RAREWARE, 0, 1);
} else {
timedFuncQueue_flush();
}
@@ -394,7 +394,7 @@ void func_8031D604(s32 arg0, s32 arg1) {
void func_8031D628(s32 arg0, s32 arg1) {
Actor *actor;
actor = func_80326EEC(0x13E);
actor = actorArray_findActorFromActorId(0x13E);
if (actor) {
marker_despawn(actor->marker);
}

2
src/core2/code_9B990.c
View File

@@ -149,7 +149,7 @@ void func_80322960(void){
void __overlay_mmm_update(void){
func_8038966C();
func_80389FC0();
organMinigame_update();
func_8038AA44();
}

244
src/core2/code_9E370.c
View File

@@ -23,7 +23,7 @@ extern void func_802C9334(s32, Actor *);
extern void func_8032B3A0(Actor *, ActorMarker *);
extern void func_8032EE0C(GenMethod_2, s32);
extern void func_8032EE20(void);
extern void func_802C4014(GenMethod_5, s32, s32, s32, s32, s32);
extern void __spawnQueue_add_5(GenMethod_5, s32, s32, s32, s32, s32);
void func_8032A6A8(Actor *arg0);
@@ -47,9 +47,9 @@ typedef struct {
}Actorlocal_Core2_9E370;
/* .data */
ActorArray *D_8036E560 = NULL; //actorArrayPtr
ActorArray *suBaddieActorArray = NULL; //actorArrayPtr
s32 D_8036E564 = 0;
s32 D_8036E568 = 0;
struct5Bs *D_8036E568 = NULL;
s32 D_8036E56C = 0;
void *D_8036E570 = NULL;
u8 D_8036E574 = 0;
@@ -64,12 +64,11 @@ f32 D_8036E598[4] = {1000.f, 20.0f, 10.5f, 1.0f};
/* .bss */
Actor *D_80383390;
s32 D_80383394;
Actor *D_80383398[14]; //array of jiggy actor ptrs
Actor *suBaddieJiggyArray[14]; //array of jiggy actor ptrs
//marker_getActorAndRotation
Actor * func_80325300(ActorMarker *marker,f32 rotation[3])
{ Actor *actor = &D_8036E560->data[marker->actrArrayIdx];
Actor * marker_getActorAndRotation(ActorMarker *marker,f32 rotation[3])
{ Actor *actor = &suBaddieActorArray->data[marker->actrArrayIdx];
rotation[0] = actor->pitch;
rotation[1] = actor->yaw;
rotation[2] = actor->roll;
@@ -119,7 +118,7 @@ void func_803253A0(Actor *this){
}
modelRender_setDepthMode(this->depth_mode);
if((s32)this->marker->unk44 != 0){
if(this->marker->unk44 != 0){
if((s32)this->marker->unk44 == 1){
func_8033A450(D_8036E568);
}
@@ -217,7 +216,7 @@ Actor *func_80325888(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp3C[3];
Actor *this;
this = func_80325300(marker, sp3C);
this = marker_getActorAndRotation(marker, sp3C);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_draw(gfx, mtx, this->position, sp3C, this->scale, (this->unk104 != NULL) ? D_8036E580 : NULL, func_803257B4(marker));
@@ -338,7 +337,7 @@ Actor *func_80325E78(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 rotation[3];
Actor *this;
this = func_80325300(marker, rotation);
this = marker_getActorAndRotation(marker, rotation);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
@@ -355,7 +354,7 @@ Actor *func_80325F2C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void func_80325F84(Actor *this){}
void func_80325F8C(void) {
D_8036E560 = NULL;
suBaddieActorArray = NULL;
D_8036E568 = func_8034A2C8();
D_8036E56C = func_802EE5E0(0x10);
D_8036E570 = func_802F2AEC();
@@ -412,20 +411,19 @@ void func_80325FE8(Actor *this) {
func_8032ACA8(this);
}
//actorArray_free()
void func_80326124(void) {
void actorArray_free(void) {
Actor *var_s0;
if (D_8036E560 != NULL) {
for(var_s0 = D_8036E560->data; var_s0 < &D_8036E560->data[D_8036E560->cnt]; var_s0++){
if (suBaddieActorArray != NULL) {
for(var_s0 = suBaddieActorArray->data; var_s0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_s0++){
func_80325FE8(var_s0);
if (var_s0->marker != NULL) {
marker_free(var_s0->marker);
}
var_s0->marker = NULL;
}
free(D_8036E560);
D_8036E560 = NULL;
free(suBaddieActorArray);
suBaddieActorArray = NULL;
}
func_8034A2A8(D_8036E568);
D_8036E568 = NULL;
@@ -529,10 +527,10 @@ void func_803268B4(void) {
s32 temp_s1;
if (D_8036E560 != NULL) {
if (suBaddieActorArray != NULL) {
sp54 = func_803203FC(101);
for(temp_v1 = D_8036E560->cnt - 1; temp_v1 >= 0; temp_v1--){
actor = &D_8036E560->data[temp_v1];
for(temp_v1 = suBaddieActorArray->cnt - 1; temp_v1 >= 0; temp_v1--){
actor = &suBaddieActorArray->data[temp_v1];
actor_info = actor->actor_info;
marker = actor->marker;
anim_ctrl = actor->animctrl;
@@ -590,7 +588,7 @@ void func_803268B4(void) {
func_802D7124(actor, actor_info->shadow_scale);
}
if (actor->unk10_0) {
actor = &D_8036E560->data[temp_v1];
actor = &suBaddieActorArray->data[temp_v1];
func_802C96E4(actor);
}
}
@@ -613,12 +611,12 @@ void func_80326C24(s32 arg0){
D_80383394 = arg0;
}
Actor *func_80326C30(enum asset_e model_id) {
Actor *actorArray_findActorFromModelId(enum asset_e model_id) {
Actor *actor_begin;
Actor *i_actor;
actor_begin = D_8036E560->data;
for(i_actor = actor_begin; (i_actor - actor_begin) < D_8036E560->cnt; i_actor++){
actor_begin = suBaddieActorArray->data;
for(i_actor = actor_begin; (i_actor - actor_begin) < suBaddieActorArray->cnt; i_actor++){
if ((model_id == i_actor->marker->modelId) && !i_actor->despawn_flag) {
return i_actor;
}
@@ -626,13 +624,13 @@ Actor *func_80326C30(enum asset_e model_id) {
return NULL;
}
Actor *func_80326CCC(s32 arg0) {
Actor *actorArray_findActorFromMarkerId(enum marker_e marker_id) {
Actor *actor_begin;
Actor *i_actor;
actor_begin = D_8036E560->data;
for(i_actor = actor_begin; i_actor - actor_begin < D_8036E560->cnt; i_actor++) {
if ((arg0 == i_actor->marker->unk14_20) && !i_actor->despawn_flag) {
actor_begin = suBaddieActorArray->data;
for(i_actor = actor_begin; i_actor - actor_begin < suBaddieActorArray->cnt; i_actor++) {
if ((marker_id == i_actor->marker->unk14_20) && !i_actor->despawn_flag) {
return i_actor;
}
}
@@ -643,20 +641,20 @@ Actor *func_80326CCC(s32 arg0) {
* find the closest actor to position with actor_id and not in state
* returns Actor* and distance (last arg)
*/
Actor *func_80326D68(f32 position[3], enum actor_e actor_id, s32 arg2, f32 *min_distance_ptr) {
Actor *actorArray_findClosestActorFromActorId(f32 position[3], enum actor_e actor_id, s32 exclude_state, f32 *min_distance_ptr) {
Actor *begin;
Actor *i_actor;
f32 i_dist;
f32 min_dist;
s32 *closest_actor;
if (D_8036E560 != NULL) {
begin = D_8036E560->data;
if (suBaddieActorArray != NULL) {
begin = suBaddieActorArray->data;
closest_actor = NULL;
min_dist = 1e+10f;
for(i_actor = begin; (i_actor - begin) < D_8036E560->cnt; i_actor++){
for(i_actor = begin; (i_actor - begin) < suBaddieActorArray->cnt; i_actor++){
if ( ((actor_id == i_actor->modelCacheIndex) || (actor_id < 0))
&& (arg2 != i_actor->state)
&& (exclude_state != i_actor->state)
&& (i_actor->modelCacheIndex != ACTOR_17_PLAYER_SHADOW)
&& (i_actor->modelCacheIndex != 0x108)
&& !i_actor->despawn_flag
@@ -676,13 +674,13 @@ Actor *func_80326D68(f32 position[3], enum actor_e actor_id, s32 arg2, f32 *min_
return NULL;
}
Actor *func_80326EEC(enum actor_e actor_id) {
Actor *actorArray_findActorFromActorId(enum actor_e actor_id) {
Actor *begin;
Actor *end;
Actor *i_actor;
begin = D_8036E560->data;
end = begin + D_8036E560->cnt;
begin = suBaddieActorArray->data;
end = begin + suBaddieActorArray->cnt;
for(i_actor = begin; i_actor < end; i_actor++){
if ((actor_id == i_actor->modelCacheIndex) && !i_actor->despawn_flag) {
return i_actor;
@@ -691,15 +689,15 @@ Actor *func_80326EEC(enum actor_e actor_id) {
return NULL;
}
s32 func_80326F58(enum actor_e actor_id) {
s32 actorArray_actorCount(enum actor_e actor_id) {
Actor *begin;
Actor *end;
Actor *i_actor;
s32 var_v1;
var_v1 = 0;
begin = D_8036E560->data;
end = begin + D_8036E560->cnt;
begin = suBaddieActorArray->data;
end = begin + suBaddieActorArray->cnt;
for(i_actor = begin; i_actor < end; i_actor++){
if ((actor_id == i_actor->modelCacheIndex) && !i_actor->despawn_flag) {
var_v1 += 1;
@@ -708,21 +706,21 @@ s32 func_80326F58(enum actor_e actor_id) {
return var_v1;
}
Actor **func_80326FC0(void) {
Actor **actorArray_findJiggyActors(void) {
Actor *begin;
Actor *i_actor;
s32 var_a1;
begin = D_8036E560->data;
for(i_actor = begin, var_a1 = 0; (D_8036E560 != NULL) && ((i_actor - begin) < D_8036E560->cnt); i_actor++){
begin = suBaddieActorArray->data;
for(i_actor = begin, var_a1 = 0; (suBaddieActorArray != NULL) && ((i_actor - begin) < suBaddieActorArray->cnt); i_actor++){
if ((i_actor->modelCacheIndex == ACTOR_46_JIGGY) && !i_actor->despawn_flag) {
D_80383398[var_a1] = i_actor;
suBaddieJiggyArray[var_a1] = i_actor;
var_a1 += 1;
}
}
D_80383398[var_a1] = NULL;
return D_80383398;
suBaddieJiggyArray[var_a1] = NULL;
return suBaddieJiggyArray;
}
bool func_803270B8(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *), ActorMarker * arg4){
@@ -731,8 +729,8 @@ bool func_803270B8(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *), ActorM
Actor * i_ptr;
var_s4 = FALSE;
start = &D_8036E560->data[0];
for(i_ptr = start; (D_8036E560 != NULL) && (i_ptr - start < D_8036E560->cnt); i_ptr++){
start = &suBaddieActorArray->data[0];
for(i_ptr = start; (suBaddieActorArray != NULL) && (i_ptr - start < suBaddieActorArray->cnt); i_ptr++){
if( !i_ptr->despawn_flag
&& i_ptr->marker->collidable
&& ((arg3 == NULL) || arg3(i_ptr))
@@ -764,18 +762,18 @@ Actor *actor_new(s32 (* position)[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
s32 i;
f32 sp44[3];
if(D_8036E560 == NULL){
D_8036E560 = (ActorArray *)malloc(sizeof(ActorArray) + 20*sizeof(Actor));
D_8036E560->cnt = 0;
D_8036E560->max_cnt = 20;
if(suBaddieActorArray == NULL){
suBaddieActorArray = (ActorArray *)malloc(sizeof(ActorArray) + 20*sizeof(Actor));
suBaddieActorArray->cnt = 0;
suBaddieActorArray->max_cnt = 20;
}
//i = D_8036E560->cnt + 1;
if(D_8036E560->cnt + 1 > D_8036E560->max_cnt){
D_8036E560->max_cnt = D_8036E560->cnt + 5;
D_8036E560 = (ActorArray *)realloc(D_8036E560, sizeof(ActorArray) + D_8036E560->max_cnt*sizeof(Actor));
//i = suBaddieActorArray->cnt + 1;
if(suBaddieActorArray->cnt + 1 > suBaddieActorArray->max_cnt){
suBaddieActorArray->max_cnt = suBaddieActorArray->cnt + 5;
suBaddieActorArray = (ActorArray *)realloc(suBaddieActorArray, sizeof(ActorArray) + suBaddieActorArray->max_cnt*sizeof(Actor));
}
++D_8036E560->cnt;
D_80383390 = &D_8036E560->data[D_8036E560->cnt - 1];
++suBaddieActorArray->cnt;
D_80383390 = &suBaddieActorArray->data[suBaddieActorArray->cnt - 1];
D_80383390->actor_info = actorInfo;
D_80383390->unk10_25 = 0;
D_80383390->unk10_18 = 0;
@@ -845,7 +843,7 @@ Actor *actor_new(s32 (* position)[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
D_80383390->unk124_31 = 0;
D_80383390->unkF4_20 = 0;
D_80383390->sound_timer = 0.0f;
func_8032FFD4(D_80383390->marker, D_8036E560->cnt - 1);
func_8032FFD4(D_80383390->marker, suBaddieActorArray->cnt - 1);
marker_setModelId(D_80383390->marker, actorInfo->modelId);
func_803300C8(D_80383390->marker, actorInfo->update_func);
func_803300D0(D_80383390->marker, actorInfo->unk10);
@@ -1036,19 +1034,19 @@ static void __actor_free(ActorMarker *arg0, Actor *arg1){
s32 arrayEnd;
//copy last actor over actor to delete
arrayEnd = &D_8036E560->data[D_8036E560->cnt - 1];
arrayEnd = &suBaddieActorArray->data[suBaddieActorArray->cnt - 1];
func_80325FE8(arg1);
if((s32)arg1 != arrayEnd)
memcpy(arg1, arrayEnd, 0x180); //memcpy
arg1->marker->actrArrayIdx = arg0->actrArrayIdx;
//remove last actor from actor array
D_8036E560->cnt--;
suBaddieActorArray->cnt--;
//shrink actor array capacity
if(D_8036E560->cnt + 8 <= D_8036E560->max_cnt){
D_8036E560->max_cnt = D_8036E560->cnt + 4;
D_8036E560 = (ActorArray *)realloc(D_8036E560, D_8036E560->max_cnt*sizeof(Actor) + sizeof(ActorArray));
if(suBaddieActorArray->cnt + 8 <= suBaddieActorArray->max_cnt){
suBaddieActorArray->max_cnt = suBaddieActorArray->cnt + 4;
suBaddieActorArray = (ActorArray *)realloc(suBaddieActorArray, suBaddieActorArray->max_cnt*sizeof(Actor) + sizeof(ActorArray));
}
marker_free(arg0);
@@ -1129,8 +1127,8 @@ void func_803283D4(void){
Actor *iPtr;
if(D_8036E574){
if(D_8036E578)
for(i = D_8036E560->cnt-1; i >= 0 ; i--){
iPtr = &D_8036E560->data[i];
for(i = suBaddieActorArray->cnt-1; i >= 0 ; i--){
iPtr = &suBaddieActorArray->data[i];
if(iPtr->despawn_flag)
__actor_free(iPtr->marker, iPtr);
}
@@ -1639,7 +1637,7 @@ Struct64s* func_8032994C(void){
//marker_getActorPtr
Actor *marker_getActor(ActorMarker *this){
return &(D_8036E560->data[this->actrArrayIdx]);
return &(suBaddieActorArray->data[this->actrArrayIdx]);
}
Actor *subaddie_getLinkedActor(Actor *this){
@@ -1709,9 +1707,9 @@ void *actors_appendToSavestate(void * begin, u32 end){
u32 sp30; //SavedActorDataSize
u32 sp2C; //SavedActorDataOffset
if(D_8036E560){
if(suBaddieActorArray){
sp30 = 0;
for(s1 = D_8036E560->data; s1 < &D_8036E560->data[(u32) D_8036E560->cnt]; s1++){
for(s1 = suBaddieActorArray->data; s1 < &suBaddieActorArray->data[(u32) suBaddieActorArray->cnt]; s1++){
if( s1->marker
&& s1->unk10_1 == 1
&& s1->despawn_flag == 0
@@ -1726,7 +1724,7 @@ void *actors_appendToSavestate(void * begin, u32 end){
end = (u32)sp3C + sp2C;
*(u32 *)end = sp30;
s0 = (Actor *)((u8*)end + sizeof(u32));
for(s1 = D_8036E560->data; s1 < &D_8036E560->data[(u32) D_8036E560->cnt]; s1++){
for(s1 = suBaddieActorArray->data; s1 < &suBaddieActorArray->data[(u32) suBaddieActorArray->cnt]; s1++){
if( s1->marker
&& s1->unk10_1 == 1
&& s1->despawn_flag == 0
@@ -1795,8 +1793,8 @@ void func_8032A09C(s32 arg0, s32 arg1) {
Actor *temp_v0_6;
func_802C3BE8();
if (D_8036E560 != NULL) {
spawnQueue_lock();
if (suBaddieActorArray != NULL) {
func_803283BC();
var_s3 = 0;
var_s0 = var_s1->actor_save_state;
@@ -1806,7 +1804,7 @@ void func_8032A09C(s32 arg0, s32 arg1) {
}
var_s0++;
}
for(var_s0 = &D_8036E560->data[0]; var_s0 < &D_8036E560->data[D_8036E560->cnt]; var_s0++){
for(var_s0 = &suBaddieActorArray->data[0]; var_s0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_s0++){
if ((var_s0->unk78_13 != 0) && (var_s3 < var_s0->unk78_13)) {
var_s3 = var_s0->unk78_13;
}
@@ -1826,7 +1824,7 @@ void func_8032A09C(s32 arg0, s32 arg1) {
}
var_s0++;
}
for(var_s0 = &D_8036E560->data[0]; var_s0 < &D_8036E560->data[D_8036E560->cnt]; var_s0++){
for(var_s0 = &suBaddieActorArray->data[0]; var_s0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_s0++){
if ((var_s0->unk78_13 != 0)) {
sp60[var_s0->unk78_13] = var_s0;
}
@@ -1865,15 +1863,15 @@ void func_8032A09C(s32 arg0, s32 arg1) {
free(sp60);
free(sp5C);
}
func_802C3BDC();
spawnQueue_unlock();
}
#endif
void func_8032A5F8(void) {
Actor *var_s0;
if (D_8036E560 != NULL) {
for(var_s0 = &D_8036E560->data[0]; var_s0 < &D_8036E560->data[D_8036E560->cnt]; var_s0++){
if (suBaddieActorArray != NULL) {
for(var_s0 = &suBaddieActorArray->data[0]; var_s0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_s0++){
if (var_s0->unk124_31 == 0xfff) {
var_s0->unk124_31 = 0;
func_8032A6A8(var_s0);
@@ -1890,7 +1888,7 @@ void func_8032A6A8(Actor *arg0) {
if (arg0->unk44_14 != -1) {
var_f0 = 1.0f;
for(var_v0 = &D_8036E560->data[0]; var_v0 < &D_8036E560->data[D_8036E560->cnt]; var_v0++){
for(var_v0 = &suBaddieActorArray->data[0]; var_v0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_v0++){
if ((arg0->unk44_14 == var_v0->unk44_14) && (arg0 != var_v0)) {
var_f2 = var_v0->unk48;
if ((var_f2 <= var_f0) && (arg0->unk48 <= var_f2)) {
@@ -1908,8 +1906,8 @@ Actor *func_8032A7AC(Actor *arg0) {
Actor *var_a0;
if (arg0->unk124_31 != 0) {
if (D_8036E560 != NULL) {
for(var_a0 = &D_8036E560->data[0]; var_a0 < &D_8036E560->data[D_8036E560->cnt]; var_a0++){
if (suBaddieActorArray != NULL) {
for(var_a0 = &suBaddieActorArray->data[0]; var_a0 < &suBaddieActorArray->data[suBaddieActorArray->cnt]; var_a0++){
if (arg0->unk124_31 == var_a0->unk78_13) {
return var_a0;
}
@@ -1977,20 +1975,20 @@ void actor_collisionOn(Actor* this){
}
void func_8032AA9C(void){
func_802C3BDC();
spawnQueue_unlock();
}
void func_8032AABC(void){
Actor *i_ptr;
Actor *start = &D_8036E560->data[0];
Actor *start = &suBaddieActorArray->data[0];
u32 i;
u32 cnt;
func_802C3BE8();
spawnQueue_lock();
if(D_8036E560 != NULL){
cnt = D_8036E560->cnt;
if(suBaddieActorArray != NULL){
cnt = suBaddieActorArray->cnt;
for(i_ptr = start, i = 0; i < cnt; i++, i_ptr++){
i_ptr->marker->unk14_21 = 0;
}
@@ -2058,15 +2056,15 @@ void func_8032AD7C(s32 arg0) {
static s32 D_8036E5A8 = 0;
if (D_8036E560 != NULL) {
if (D_8036E5A8 >= D_8036E560->cnt) {
if (suBaddieActorArray != NULL) {
if (D_8036E5A8 >= suBaddieActorArray->cnt) {
D_8036E5A8 = 0;
}
for(var_s0 = 0; var_s0 < ((arg0 == 1) ? 0xF : D_8036E560->cnt); var_s0++){
if (func_80330E28(&D_8036E560->data[D_8036E5A8]) == NULL) {
func_8032ACA8(&D_8036E560->data[D_8036E5A8]);
for(var_s0 = 0; var_s0 < ((arg0 == 1) ? 0xF : suBaddieActorArray->cnt); var_s0++){
if (func_80330E28(&suBaddieActorArray->data[D_8036E5A8]) == NULL) {
func_8032ACA8(&suBaddieActorArray->data[D_8036E5A8]);
}
D_8036E5A8 = (D_8036E5A8 + 1) % D_8036E560->cnt;
D_8036E5A8 = (D_8036E5A8 + 1) % suBaddieActorArray->cnt;
}
}
}
@@ -2076,13 +2074,13 @@ void func_8032AEB4(void) {
Actor *temp_s2;
Actor *var_s0;
temp_s2 = &D_8036E560->data[0];
for(var_s0 = temp_s2; (D_8036E560 != NULL) && ((var_s0 - temp_s2) != D_8036E560->cnt); var_s0++){
temp_s2 = &suBaddieActorArray->data[0];
for(var_s0 = temp_s2; (suBaddieActorArray != NULL) && ((var_s0 - temp_s2) != suBaddieActorArray->cnt); var_s0++){
func_8032ACA8(var_s0);
}
}
void func_8032AF94(void) {
void actorArray_defrag(void) {
AnimCtrl *temp_a0_4;
ParticleEmitter *temp_a0_2;
ParticleEmitter *temp_a0_3;
@@ -2095,52 +2093,52 @@ void func_8032AF94(void) {
s32 temp_a0_9;
s32 temp_t7;
s32 var_s1;
Actor *temp_s0;
Actor *i_actor;
void *temp_s0_2;
static s32 D_8036E5AC = 0;
if (D_8036E560 != NULL) {
if (suBaddieActorArray != NULL) {
for(var_s1 = 0; var_s1 < 8; var_s1++){
D_8036E5AC++;
if (D_8036E5AC >= D_8036E560->cnt) {
if (D_8036E5AC >= suBaddieActorArray->cnt) {
D_8036E5AC = 0;
}
temp_s0 = &D_8036E560->data[D_8036E5AC];
i_actor = &suBaddieActorArray->data[D_8036E5AC];
if ((s32)temp_s0->marker->unk44 < 0) {
temp_s0->marker->unk44 = func_8034A348(temp_s0->marker->unk44);
if ((s32)i_actor->marker->unk44 < 0) {
i_actor->marker->unk44 = func_8034A348(i_actor->marker->unk44);
}
if (temp_s0->unk158[0] != NULL) {
temp_s0->unk158[0] = func_802F0D74(temp_s0->unk158[0]);
if (i_actor->unk158[0] != NULL) {
i_actor->unk158[0] = func_802F0D74(i_actor->unk158[0]);
}
if (temp_s0->unk158[1] != NULL) {
temp_s0->unk158[1] = func_802F0D74(temp_s0->unk158[1]);
if (i_actor->unk158[1] != NULL) {
i_actor->unk158[1] = func_802F0D74(i_actor->unk158[1]);
}
if (temp_s0->animctrl != NULL) {
temp_s0->animctrl = animctrl_defrag(temp_s0->animctrl);
if (i_actor->animctrl != NULL) {
i_actor->animctrl = animctrl_defrag(i_actor->animctrl);
}
if (temp_s0->marker->unk20 != NULL) {
temp_s0->marker->unk20 = func_802EA374(temp_s0->marker->unk20);
if (i_actor->marker->unk20 != NULL) {
i_actor->marker->unk20 = func_802EA374(i_actor->marker->unk20);
}
if (temp_s0->unk148 != NULL) {
temp_s0->unk148 = (Struct80s*)defrag(temp_s0->unk148);
if (i_actor->unk148 != NULL) {
i_actor->unk148 = (Struct80s*)defrag(i_actor->unk148);
}
if (temp_s0->marker->unk50 != NULL) {
temp_s0->marker->unk50 = func_803406D4(temp_s0->marker->unk50);
if (i_actor->marker->unk50 != NULL) {
i_actor->marker->unk50 = func_803406D4(i_actor->marker->unk50);
}
if (temp_s0->marker->unk14_20 == MARKER_217_BEE_SWARM) {
func_802CEB60(temp_s0);
if (i_actor->marker->unk14_20 == MARKER_217_BEE_SWARM) {
func_802CEB60(i_actor);
}
}
D_8036E560 = (ActorArray *) defrag(D_8036E560);
suBaddieActorArray = (ActorArray *) defrag(suBaddieActorArray);
}
if (D_8036E568 != 0) {
@@ -2156,10 +2154,10 @@ ActorMarker *func_8032B16C(enum jiggy_e jiggy_id) {
Actor *temp_s3;
Actor *var_s0;
if (D_8036E560 != NULL) {
temp_s3 = &D_8036E560->data[0];
for(var_s0 = temp_s3; (var_s0 - temp_s3) < D_8036E560->cnt; var_s0++){
if ((var_s0->marker->unk14_20 == MARKER_52_JIGGY) && (func_802C8088(&(var_s0->marker)) == jiggy_id)) {
if (suBaddieActorArray != NULL) {
temp_s3 = &suBaddieActorArray->data[0];
for(var_s0 = temp_s3; (var_s0 - temp_s3) < suBaddieActorArray->cnt; var_s0++){
if ((var_s0->marker->unk14_20 == MARKER_52_JIGGY) && (chjiggy_getJiggyId(&(var_s0->marker)) == jiggy_id)) {
return var_s0->marker;
}
}
@@ -2178,12 +2176,12 @@ void func_8032B258(Actor *this, enum collision_e arg1) {
func_8034A174( this->marker->unk44, 0x20, sp38);
}
if (((s32)this->marker->unk44 < 0) && ((sp38[0] != 0.0f) || (sp38[1] != 0.0f) || (sp38[2] != 0.0f))) {
func_802C4014((GenMethod_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,sp38[0]), reinterpret_cast(s32,sp38[1]), reinterpret_cast(s32,sp38[2]), reinterpret_cast(s32,sp44));
__spawnQueue_add_5((GenMethod_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,sp38[0]), reinterpret_cast(s32,sp38[1]), reinterpret_cast(s32,sp38[2]), reinterpret_cast(s32,sp44));
return;
}
else{
sp34 = this->position[1] + 50.0f;
func_802C4014((GenMethod_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,this->position[0]), reinterpret_cast(s32,sp34), reinterpret_cast(s32,this->position[2]), reinterpret_cast(s32,sp44));
__spawnQueue_add_5((GenMethod_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,this->position[0]), reinterpret_cast(s32,sp34), reinterpret_cast(s32,this->position[2]), reinterpret_cast(s32,sp44));
}
}
}
@@ -2299,15 +2297,15 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
}
func_8032EE0C(func_8032B38C, this);
if (((s32)arg0->unk44 < 0) && ((sp50[0] != 0.0f) || (sp50[1] != 0.0f) || (sp50[2] != 0.0f))) {
func_802C4014(func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, sp5C));
__spawnQueue_add_5((GenMethod_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, sp5C));
} else if (this->unk16C_3 && func_803048E0(sp3C, &sp4C, &sp48, 3, (s32) (func_8033229C(arg0) * 4.0f))) {
sp50[0] = (f32) sp48->x;
sp50[1] = (f32) sp48->y;
sp50[2] = (f32) sp48->z;
func_802C4014(func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, sp5C));
__spawnQueue_add_5((GenMethod_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, sp5C));
} else {
sp38 = this->position[1] + func_8033229C(arg0);
func_802C4014(func_802C4260, sp70 + 0x15, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, sp38), reinterpret_cast(s32, this->position[2]), reinterpret_cast(s32, sp5C));
__spawnQueue_add_5((GenMethod_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, sp38), reinterpret_cast(s32, this->position[2]), reinterpret_cast(s32, sp5C));
}
func_8032EE20();
}

6
src/core2/code_A5BC0.c
View File

@@ -7,7 +7,7 @@
extern int func_802E74A0(f32[3], f32, s32, s32);
extern s32 func_802E9118(BKCollisionList * collision_list, BKVertexList *vtx_list, f32 arg2[3], s32 arg3, f32 arg4, f32 arg5[3], f32 arg6[3], f32 arg7, f32 arg8[3], s32 arg9, s32 argA);
extern f32 func_802EC920(BKVertexList *);
extern void func_802C39D4(void);
extern void spawnQueue_func_802C39D4(void);
extern bool func_80340020(s32, f32[3], f32[3], f32, s32, BKVertexList *, f32[3], f32[3]);
extern void func_80340200(s32, f32[3], f32[3], f32, s32, s32, BKVertexList *, s32);
extern s32 func_802E9DD8(BKCollisionList *collisionList, BKVertexList *vtxList, f32 arg2[3], f32 *arg3, f32 arg4, f32 arg5[3], f32 arg6, f32 arg7[3], s32 arg8);
@@ -1597,7 +1597,7 @@ void func_80330FF4(void){
func_80340200(D_8038341C->unk50, phi_s0->position, scale, 1.0f, NULL, D_80383420, func_80330DA4(phi_s0), D_80383410);
}//L8033108C
func_802C39D4();
spawnQueue_func_802C39D4();
if(D_8038341C != NULL){
phi_s0 = marker_getActor(D_8038341C);
player_getPosition(sp48);
@@ -1650,7 +1650,7 @@ s32 func_803311D4(Cube *arg0, f32 *arg1, f32 *arg2, f32 *arg3, u32 arg4) {
f32 var_f10;
f32 var_f4;
f32 var_f6;
s32 (*temp_v1_2)(struct actor_marker_s *, f32 [3], f32, f32 [3], s32);
s32 (*temp_v1_2)(struct actorMarker_s *, f32 [3], f32, f32 [3], s32);
s32 temp_s0;
s32 temp_s0_2;
BKCollisionList *temp_s2;

14
src/core2/code_ABC00.c
View File

@@ -174,10 +174,10 @@ void func_80332CCC(void) {
Actor **temp_v0;
s32 i;
temp_v0 = func_80326FC0();
temp_v0 = actorArray_findJiggyActors();
for(D_8038356C = 0; temp_v0[D_8038356C] != NULL; D_8038356C++){
if(!temp_v0[D_8038356C]->unk44_2){
D_8036E834[func_802C8088(temp_v0[D_8038356C]) - 1].unk10.marker = temp_v0[D_8038356C]->marker;
D_8036E834[chjiggy_getJiggyId(temp_v0[D_8038356C]) - 1].unk10.marker = temp_v0[D_8038356C]->marker;
}
}
}
@@ -274,7 +274,7 @@ void func_80333270(enum jiggy_e jiggy_id, f32 position[3], void (*method)(Actor
void func_803332D0(Actor *arg0)
{
s32 indx = func_802C8088(arg0) - 1;
s32 indx = chjiggy_getJiggyId(arg0) - 1;
Struct81s *sp18 = &D_8036E834[indx].unk10;
if (D_8036E834[indx].unkC)
{
@@ -305,16 +305,16 @@ void func_80333388(enum jiggy_e jiggy_id) {
}
void func_803333DC(Struct81s *arg0, Actor *arg1) {
s32 sp20;
s32 jiggy_id;
arg0->marker = arg1->marker;
if (arg0->unk14 != NULL) {
arg0->unk14(arg1, arg0->unk18);
}
func_803300D8(arg1->marker, func_803332D0);
sp20 = ((s32) ((s32)arg0 - (s32)&D_8036E834) / 0x2C) + 1;
func_802C80B4(arg1, sp20);
if ((sp20 == JIGGY_49_CCW_EYRIE) || (sp20 == JIGGY_39_LAIR_MMM_WITCH_SWITCH) || (sp20 == JIGGY_3C_LAIR_CCW_WITCH_SWITCH)) {
jiggy_id = ((s32) ((s32)arg0 - (s32)&D_8036E834) / 0x2C) + 1;
chjiggy_setJiggyId(arg1, jiggy_id);
if ((jiggy_id == JIGGY_49_CCW_EYRIE) || (jiggy_id == JIGGY_39_LAIR_MMM_WITCH_SWITCH) || (jiggy_id == JIGGY_3C_LAIR_CCW_WITCH_SWITCH)) {
arg1->marker->unk40_21 = TRUE;
arg1->marker->unk40_20 = TRUE;
}

8
src/core2/code_AC520.c
View File

@@ -40,7 +40,7 @@ extern void func_803334B0(f32 position[3], f32 rotation[3], f32 scale, f32 arg3[
end_ptr = (Struct_core2_AC520_0 *)vector_getEnd(D_80383570.unk0);
mlMtxIdent();
func_80252CC4(position, rotation, scale, arg3);
D_80383570.unk44 = &D_80383570.unk4;
D_80383570.unk44 = D_80383570.unk4;
iPtr = start_ptr;
for(; iPtr < end_ptr && D_80383570.unk44 < D_80383570.unk48; iPtr++){
if(iPtr->unk34 && ml_vec3f_distance(position, iPtr->unk0) < iPtr->unk1C + arg4){
@@ -148,7 +148,7 @@ void func_80333974(s32 index){
v0->unk34 = 0;
}
s32 func_803339A4(s32 arg0){
s32 func_803339A4(f32 arg0[3]){
Struct_core2_AC520_0 *beginPtr = vector_getBegin(D_80383570.unk0);
Struct_core2_AC520_0 *endPtr = vector_getEnd(D_80383570.unk0);
Struct_core2_AC520_0 *iPtr;
@@ -156,7 +156,7 @@ s32 func_803339A4(s32 arg0){
for(iPtr = beginPtr; iPtr < endPtr; iPtr++){
if(iPtr->unk34){
if(!tmp_s0 || ml_vec3f_distance(arg0, iPtr) < ml_vec3f_distance(arg0, tmp_s0)){
if(tmp_s0 == NULL || ml_vec3f_distance(arg0, iPtr->unk0) < ml_vec3f_distance(arg0, tmp_s0->unk0)){
tmp_s0 = iPtr;
}
}
@@ -221,7 +221,7 @@ s32 func_80333C78(s32 arg0){
return func_8034AF98(arg0, 0);
}
void func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, s32 arg4, BKVertexList *arg5) {
void func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, f32 arg4[3], BKVertexList *arg5) {
static s32 D_8036F970[3] = {0, 0, 0};
Vtx *i_ptr;
Vtx *end_ptr;

10
src/core2/code_AD5B0.c
View File

@@ -36,7 +36,7 @@ void func_80334540(Gfx** gdl, Mtx **mptr, Vtx **vptr) {
if (func_80320708() == 0) {
write_file_blocks(0, 0, 0x80BC7230, EEPROM_MAXBLOCKS);
}
func_802C3BDC();
spawnQueue_unlock();
sky_draw(gdl, mptr, vptr);
func_802BBD2C(&sp44, &sp40);
func_8024CE60(sp44, sp40);
@@ -96,7 +96,7 @@ void func_80334540(Gfx** gdl, Mtx **mptr, Vtx **vptr) {
if (func_802E49F0() == 0) {
func_802BBD0C(gdl, mptr, vptr);
}
func_802C3BE8();
spawnQueue_lock();
}
void func_803348B0(s32 arg0, s32 arg1, s32 arg2){
@@ -135,7 +135,7 @@ void func_80334910(void) {
func_8028E644();
func_80322F5C();
func_80341A54();
func_802C398C();
spawnQueue_free();
func_802F53D0();
func_802FAC3C();
func_802C8F68();
@@ -210,7 +210,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
func_802FAE4C();
}
func_8031B644();
func_802C2B10();
spawnQueue_malloc();
func_803329AC();
func_80350BFC();
func_80323190();
@@ -244,7 +244,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
gcdialog_init();
mapSpecificFlags_clearAll();
func_803411B0();
func_802C2B5C();
spawnQueue_reset();
func_80322FBC();
func_8028E4B0();
func_80322F9C();

18
src/core2/code_B3A80.c
View File

@@ -47,7 +47,7 @@ f32 func_8033AA10(AnimationFile *this, s32 arg1){
return (f32)(arg1 - this->unk0)/(f32)(this->unk2 - this->unk0);
}
void func_8033AA50(AnimationFile *anim_file, f32 arg1, s32 arg2){
void func_8033AA50(AnimationFile *anim_file, f32 arg1, Struct_B1400 *arg2){
s32 tmp_s1;
int i;
f32 tmp_f22;
@@ -55,7 +55,7 @@ void func_8033AA50(AnimationFile *anim_file, f32 arg1, s32 arg2){
f32 sp54[3][3];
tmp_f22 = func_8033ABA0(anim_file, arg1);
tmp_s0 = (s32)anim_file + sizeof(AnimationFile);
tmp_s0 = (AnimationFileElement *)((s32)anim_file + sizeof(AnimationFile));
tmp_s1 = 0;
for(i = 0; i < anim_file->elem_cnt; i++){//L8033AAB8
if(tmp_s0->unk0_15 != tmp_s1){
@@ -199,7 +199,7 @@ void func_8033B180(void){
}
void func_8033B1BC(void){
struct21s *tmp_a0;
vector(struct21s) *tmp_a0;
struct21s *iPtr;
struct21s *start_ptr;
struct21s *endPtr;
@@ -220,8 +220,8 @@ void func_8033B1BC(void){
}
void func_8033B268(void){
D_80383CE0[0] = defrag(D_80383CE0[0]);
D_80383CE0[1] = defrag(D_80383CE0[1]);
D_80383CE0[0] = (vector(struct21s) *)defrag(D_80383CE0[0]);
D_80383CE0[1] = (vector(struct21s) *)defrag(D_80383CE0[1]);
}
void func_8033B2A4(s32 arg0) {
@@ -385,7 +385,7 @@ void *assetcache_get(s32 arg0) {
if (func_8025498C((u32)comp_size + uncomp_size) && !sp28) {
sp33 = 1;
uncompressed_file = malloc((u32)comp_size + uncomp_size);
compressed_file = (s32) uncompressed_file + uncomp_size;
compressed_file = (void *)((s32) uncompressed_file + uncomp_size);
} else {
sp33 = 2;
if (sp28 != 0) {
@@ -513,7 +513,7 @@ s32 func_8033BDAC(enum asset_e id, void *dst, s32 size) {
}
else if(size >= var_s0) {
sp2B = 2;
comp_ptr = malloc(comp_ptr);
comp_ptr = (s32)malloc(comp_ptr);
}
else{
return 0;
@@ -525,7 +525,7 @@ s32 func_8033BDAC(enum asset_e id, void *dst, s32 size) {
var_s0 = (comp_ptr - (comp_ptr & (0x10 -1))) + 0x10;
if(size >= comp_ptr){
comp_ptr = dst;
comp_ptr = (s32)dst;
}
else{
return 0;
@@ -537,7 +537,7 @@ s32 func_8033BDAC(enum asset_e id, void *dst, s32 size) {
rarezip_inflate(comp_ptr, dst);
osWritebackDCache(dst, D_80370A10);
if (sp2B == 2) {
free(comp_ptr);
free((void *)comp_ptr);
}
}
return var_s0;

2
src/core2/code_C0B80.c
View File

@@ -12,7 +12,7 @@ void func_80347B10(Struct81s *arg0){
}
void func_80347B54(Struct81s *arg0){
__spawnqueue_add_1((GenMethod_1)func_80347B10, reinterpret_cast(s32, arg0));
__spawnQueue_add_1((GenMethod_1)func_80347B10, reinterpret_cast(s32, arg0));
}
void func_80347B80(Struct81s *arg0) {

2
src/core2/code_C0CF0.c
View File

@@ -14,7 +14,7 @@ void func_80347C80(Struct81s *arg0){
}
void func_80347CC8(Struct81s *arg0){
__spawnqueue_add_1((GenMethod_1)func_80347C80, reinterpret_cast(s32, arg0));
__spawnQueue_add_1((GenMethod_1)func_80347C80, reinterpret_cast(s32, arg0));
}
void func_80347CF4(Struct81s *arg0) {

2
src/core2/code_C0E60.c
View File

@@ -79,7 +79,7 @@ void func_80347DF0(Struct81s *arg0){
}
void func_80347E34(Struct81s *arg0){
__spawnqueue_add_1((GenMethod_1) func_80347DF0, reinterpret_cast(s32, arg0));
__spawnQueue_add_1((GenMethod_1) func_80347DF0, reinterpret_cast(s32, arg0));
}
void func_80347E60(Struct81s *arg0) {

2
src/core2/code_C5440.c
View File

@@ -196,4 +196,4 @@ void * func_8034C9D4(void){
D_80372030[iPtr->unk6].unk4(&iPtr->unk8, iPtr->unk0, iPtr->unk4);
}
}
}

2
src/core2/code_D5D10.c
View File

@@ -73,7 +73,7 @@ void chskeleton_despawn(ActorMarker *marker, s32 arg1) {
func_802DAD8C(partEmitList_pushNew(2), this, ASSET_4CD_MODEL_LIMBO_ARM);
func_8035CCA0(partEmitList_pushNew(4), this, ASSET_4D0_MODEL_LIMBO_BONE);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 1.0f, 32000, this->position, 1250, 2500);
func_802C3F04(func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(marker);
}

4
src/core2/code_D6180.c
View File

@@ -71,7 +71,7 @@ void func_8035D1F0(ActorMarker *arg0, s32 arg1) {
func_802DAD8C(partEmitList_pushNew(2), this, ASSET_4C8_MODEL_MUMMUM_ARM);
func_8035D110(partEmitList_pushNew(1), this, ASSET_4CB_MODEL_MUMMUM_BODY);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 0.8f, 32000, this->position, 1250, 2500);
func_802C3F04((GenMethod_4) func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenMethod_4) func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(arg0);
}
@@ -151,4 +151,4 @@ void func_8035D4F0(ActorMarker *marker, s32 arg1){
}
}
}
}
}

2
src/core2/code_D7D10.c
View File

@@ -44,7 +44,7 @@ Actor *func_8035ECA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *this;
ActorLocal_core2_D7D10 *local;
this = func_80325300(marker, rotation);
this = marker_getActorAndRotation(marker, rotation);
local = (ActorLocal_core2_D7D10 *)&this->local;
func_8033A45C(3, (s32) this->velocity[1]);
func_8033A45C(4, local->unk0);

10
src/core2/code_DAAA0.c
View File

@@ -146,19 +146,19 @@ void func_80361BD0(s32 arg0, s32 arg1, s32 arg2){
actor->unk124_11 = arg2;
}
void func_80361C24(s32 arg0, f32 arg1, s32 arg2, f32 arg3){
void func_80361C24(s32 arg0, f32 arg1, ActorMarker * arg2, f32 arg3){
func_80288D84(arg0, arg1, func_80361B68, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3));
}
void func_80361C64(s32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4){
void func_80361C64(s32 arg0, f32 arg1, ActorMarker * arg2, s32 arg3, s32 arg4){
func_80288DCC(arg0, arg1, func_80361B98, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), arg4);
}
void func_80361CAC(s32 arg0, f32 arg1, s32 arg2, f32 arg3){
void func_80361CAC(s32 arg0, f32 arg1, ActorMarker *arg2, f32 arg3){
func_80288DCC(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 1);
}
void func_80361CF4(s32 arg0, f32 arg1, s32 arg2, f32 arg3){
void func_80361CF4(s32 arg0, f32 arg1, ActorMarker *arg2, f32 arg3){
func_80288DCC(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 2);
}
@@ -166,7 +166,7 @@ void func_80361D3C(s32 arg0, f32 arg1, s32 arg2, s32 arg3){
func_80288D84(arg0, arg1, func_80361AB0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3));
}
void func_80361D7C(s32 arg0, f32 arg1, s32 arg2, s32 arg3, u32 arg4){
void func_80361D7C(s32 arg0, f32 arg1, struct ActorMarker *arg2, s32 arg3, u32 arg4){
func_80288DCC(arg0, arg1, func_80361AE0, reinterpret_cast(s32, arg2), arg3, arg4);
}

2
src/core2/code_EE40.c
View File

@@ -15,7 +15,7 @@ void func_80295DD0(void){
s32 sp24[3];
s32 sp18[3];
func_80309998(sp18, sp24);
mapModel_getBounds(sp18, sp24);
ml_vec3w_to_vec3f(D_8037C3C0.unkC, sp18);
ml_vec3w_to_vec3f(D_8037C3C0.unk0, sp24);
D_8037C3C0.unkC[0] -= 400.0f;

12
src/core2/gc/pauseMenu.c
View File

@@ -62,7 +62,7 @@ extern void func_8033BD20(void *);
enum gcpausemenu_state_e {
PAUSE_STATE_0_CLOSED = 0,
PAUSE_STATE_1_OPENING = 1,
PAUSE_STATE_1_OPENING = 1
};
@@ -191,7 +191,7 @@ void gcpausemenu_defrag(void){
for(i =0; i< 4; i++){
if(D_80383010.zoombox[i]){
func_80318C0C(D_80383010.zoombox[i]);
D_80383010.zoombox[i] = defrag(D_80383010.zoombox[i]);
D_80383010.zoombox[i] = (gczoombox_t *)defrag(D_80383010.zoombox[i]);
}
}
}
@@ -312,7 +312,7 @@ char *gcpausemenu_TimeToA(int time){
void gcpausemenu_printLevelTotals(enum level_e level){
s32 val;
s32 max;
const char empty[1] = 0; //empty
char empty[] = {0}; //empty
//note ratio 2 string
gcpausemenu_getLevelNoteScore(level, &val, &max);
@@ -357,7 +357,7 @@ void gcpausemenu_getTotalHoneycombScore(s32 *dst){
void gcpausemenu_printTotals(void){
s32 val;
const char D_8036C61C[] = 0;
char D_8036C61C[] = {0};
//note ratio 2 string
gcpausemenu_getTotalNoteScore(&val);
@@ -1238,7 +1238,7 @@ void __gcpausemenu_drawSprite(Gfx** gdl, Mtx** mptr, Vtx** vptr, BKSprite* sprit
}
void gcpausemenu_drawSprite(Gfx** gdl, Mtx** mptr, s32 vptr, BKSprite *sprite, s32 frame, f32 x, f32 y, s32 mirror, u8 a){
void gcpausemenu_drawSprite(Gfx** gdl, Mtx** mptr, Vtx **vptr, BKSprite *sprite, s32 frame, f32 x, f32 y, s32 mirror, u8 a){
BKSpriteFrame *_frame;
s32 w;
s32 h;
@@ -1359,7 +1359,7 @@ void gcpausemenu_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
func_8033A45C(i, 1);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_NONE);
modelRender_setAlpha(D_80383010.sns_alpha);
modelRender_draw(gfx, mtx, &sp98, &sp8C, 0.8f, &sp80, D_80383010.sns_egg_model);
modelRender_draw(gfx, mtx, sp98, sp8C, 0.8f, sp80, D_80383010.sns_egg_model);
func_8024E2FC();
func_8024C904(gfx, mtx);
}

4
src/core2/gc/section.c
View File

@@ -182,7 +182,7 @@ MapInfo * func_8030AD00(enum map_e map_id){
enum level_e map_getLevel(enum map_e map){
return func_8030AD00(map)->level_id;
};
}
/* returns string containing the map name and index */
char *gcsection_getName(enum map_e map){
@@ -280,4 +280,4 @@ void func_8030AFD8(s32 arg0){
func_80250FC0(); //stop controller motor
gcpausemenu_80314B24();
func_80347A70();
}
}

55
src/core2/mapModel.c
View File

@@ -7,9 +7,8 @@
extern UNK_TYPE(s32) func_802E8E88(BKCollisionList *, BKVertexList *, f32[3], f32[3], f32, f32[3], s32, s32);
extern UNK_TYPE(s32) func_802E92AC(BKCollisionList *, BKVertexList *, f32[3], f32, f32[3], s32);
extern s32 func_802EC394(BKModelUnk14List *arg0, s32 arg1, s32 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6);
extern void func_802EC458(BKVertexList *, s32[3], s32[3]);
extern void vtxList_getBounds_s32(BKVertexList *, s32[3], s32[3]);
extern void func_802F7BC0(Gfx **, Mtx **, Vtx **);
extern void func_8033A450(s32);
extern void func_8033A45C(s32, s32);
@@ -308,7 +307,7 @@ void mapModel_opa_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
func_8033A45C(2, 1);
break;
case MAP_1D_MMM_CELLAR:
func_8033A45C(1, func_80326EEC(0x191) ? 0 : 1);
func_8033A45C(1, actorArray_findActorFromActorId(0x191) ? 0 : 1);
break;
case MAP_7C_CS_INTRO_BANJOS_HOUSE_1:
case MAP_89_CS_INTRO_BANJOS_HOUSE_2:
@@ -355,7 +354,7 @@ void mapModel_xlu_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
if (mapModel.model_bin_xlu != NULL) {
if (map_get() == MAP_1D_MMM_CELLAR) {
func_8033A45C(1, (func_80326EEC(0x191) != NULL) ? 0 : 1);
func_8033A45C(1, (actorArray_findActorFromActorId(0x191) != NULL) ? 0 : 1);
}
modelRender_setDepthMode(MODEL_RENDER_DEPTH_COMPARE);
temp_a0 = mapModel.unk4;
@@ -399,46 +398,46 @@ struct5Bs *func_803097A0(void){
}
void func_803097AC(s32 arg0[3], s32 arg1[3]) {
func_802EC458(func_8033A148(mapModel.model_bin_opa), arg0, arg1);
func_8033ECD8(arg0, arg1, 1000);
arg0[0] = arg0[0] + mapModel.description->unk6[0];
arg0[1] = arg0[1] + mapModel.description->unk6[1];
arg0[2] = arg0[2] + mapModel.description->unk6[2];
arg1[0] = arg1[0] + mapModel.description->unkC[0];
arg1[1] = arg1[1] + mapModel.description->unkC[1];
arg1[2] = arg1[2] + mapModel.description->unkC[2];
void mapModel_getCubeBounds(s32 min[3], s32 max[3]) {
vtxList_getBounds_s32(func_8033A148(mapModel.model_bin_opa), min, max);
func_8033ECD8(min, max, 1000);
min[0] = min[0] + mapModel.description->unk6[0];
min[1] = min[1] + mapModel.description->unk6[1];
min[2] = min[2] + mapModel.description->unk6[2];
max[0] = max[0] + mapModel.description->unkC[0];
max[1] = max[1] + mapModel.description->unkC[1];
max[2] = max[2] + mapModel.description->unkC[2];
}
void func_80309888(s32 arg0[3], s32 arg1[3]) {
void mapModel_getOpaBounds(s32 min[3], s32 max[3]) {
s32 i;
func_802EC458(func_8033A148(mapModel.model_bin_opa), arg0, arg1);
vtxList_getBounds_s32(func_8033A148(mapModel.model_bin_opa), min, max);
for(i = 0; i < 3; i++){
arg0[i] *= mapModel.scale;
arg1[i] *= mapModel.scale;
min[i] *= mapModel.scale;
max[i] *= mapModel.scale;
}
}
void func_80309998(s32 arg0[3], s32 arg1[3]) {
void mapModel_getBounds(s32 min[3], s32 max[3]) {
s32 i, j;
s32 sp3C[3];
s32 sp30[3];
s32 xlu_min[3];
s32 xlu_max[3];
func_802EC458(func_8033A148(mapModel.model_bin_opa), arg0, arg1);
vtxList_getBounds_s32(func_8033A148(mapModel.model_bin_opa), min, max);
for(i = 0; i < 3; i++){
arg0[i] *= mapModel.scale;
arg1[i] *= mapModel.scale;
min[i] *= mapModel.scale;
max[i] *= mapModel.scale;
}
if (mapModel.model_bin_xlu != NULL) {
func_802EC458(func_8033A148(mapModel.model_bin_xlu), sp3C, sp30);
vtxList_getBounds_s32(func_8033A148(mapModel.model_bin_xlu), xlu_min, xlu_max);
for(j = 0; j < 3; j++){
if(sp3C[j] < arg0[j]){
arg0[j] = sp3C[j];
if(xlu_min[j] < min[j]){
min[j] = xlu_min[j];
}
if(arg1[j] < sp30[j]){
arg1[j] = sp30[j];
if(max[j] < xlu_max[j]){
max[j] = xlu_max[j];
}
}

4
src/core2/modelRender.c
View File

@@ -600,7 +600,7 @@ enum model_render_color_mode_e{
};
/* .bss */
s32 D_80383650;
struct5Bs *D_80383650;
s32 D_80383658[0x2A];
s32 D_80383700;
bool D_80383704;
@@ -1479,7 +1479,7 @@ void func_8033A444(struct58s *arg0){
D_8038371C = arg0;
}
void func_8033A450(s32 arg0){
void func_8033A450(struct5Bs *arg0){
D_80383650 = arg0;
}

2
src/core2/playerModel.c
View File

@@ -144,7 +144,7 @@ void playerModel_reset(void){
if(!func_8028ADB4())
playerModel_updateModel();
player_getPosition(plyr_pos);
func_802C3F04((GenMethod_4)func_802C4140,
__spawnQueue_add_4((GenMethod_4)func_802C4140,
ACTOR_17_PLAYER_SHADOW,
reinterpret_cast(s32, plyr_pos[0]),
reinterpret_cast(s32, plyr_pos[1]),

12
src/core2/sla.c
View File

@@ -44,17 +44,17 @@ void *func_802EDAA4(SLA **this, s32 *arg1) {
first_ptr = (s16*)var_s0->unk4;
var_s0->elem_cnt = new_cnt;
*this = var_s0;
for(i = new_cnt - 1, i_ptr = &var_s0->unk4[i * var_s0->elem_size]; i >= prev_cnt; i--){
for(i = new_cnt - 1, i_ptr = (s16*)&var_s0->unk4[i * var_s0->elem_size]; i >= prev_cnt; i--){
*i_ptr = *first_ptr;
*first_ptr = i;
i_ptr = (s32)i_ptr - var_s0->elem_size;
i_ptr = (s16*)((s32)i_ptr - var_s0->elem_size);
}
}
i = *first_ptr;
i_ptr = (s32)first_ptr + (i * var_s0->elem_size);
i_ptr = (s16*)((s32)first_ptr + (i * var_s0->elem_size));
*arg1 = i;
*first_ptr = *i_ptr;
return (s32) i_ptr;
return (void *) i_ptr;
}
int func_802EDC18(SLA *this, s32 arg1)
@@ -88,11 +88,11 @@ SLA *array_new(s32 size, s32 cnt){
}
void func_802EDCDC(SLA *this, s32 indx){
void* *ptr_n = ((s32)(this + 1) + indx*this->elem_size);
void* *ptr_n = (void *)((s32)(this + 1) + indx*this->elem_size);
*(s16 *)ptr_n = *(s16 *)(this +1);
*(s16 *)(this +1) = indx;
}
SLA *array_defrag(SLA *this){
return defrag(this);
return (SLA *)defrag(this);
}

164
src/core2/code_3BB80.c → src/core2/spawnqueue.c
View File

@@ -7,8 +7,8 @@
void func_802E1790(void);
void func_802C3BDC(void);
void func_802C3BE8(void);
void spawnQueue_unlock(void);
void spawnQueue_lock(void);
Actor *func_802D7558(s32 *, s32, ActorInfo*, u32);
Actor *func_802D75B4(s32 *, s32, ActorInfo*, u32);
@@ -173,22 +173,22 @@ typedef struct function_queue_s{
}FunctionQueue;
/* .data */
u8 D_80365DC0 = 0;
u8 D_80365DC4 = 0;
FunctionQueue *D_80365DC8 = NULL;
u8 spawnQueueLock = 0;
u8 spawnQueueLength = 0;
FunctionQueue *spawnQueue = NULL;
/* .code */
void func_802C2B10(void){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
D_80365DC8 = (FunctionQueue *) malloc(tmp * sizeof(FunctionQueue));
void spawnQueue_malloc(void){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 50: 15;
spawnQueue = (FunctionQueue *) malloc(tmp * sizeof(FunctionQueue));
}
void func_802C2B5C(void){
void spawnQueue_reset(void){
s32 loaded_asm_file;
loaded_asm_file = get_loaded_overlay_id();
func_802C3BE8();
D_80365DC4 = 0;
spawnQueue_lock();
spawnQueueLength = 0;
func_802D1724();
func_802E1790();
switch(loaded_asm_file){
@@ -402,136 +402,136 @@ void func_802C2B5C(void){
}
func_80305990(1);
func_8032A5F8();
func_802C3BDC();
spawnQueue_unlock();
}
void func_802C398C(void){
void spawnQueue_free(void){
spawnableActorList_free();
func_80326124();
actorArray_free();
func_80305D94();
free(D_80365DC8);
D_80365DC8 = NULL;
D_80365DC4 = 0;
free(spawnQueue);
spawnQueue = NULL;
spawnQueueLength = 0;
}
void func_802C39D4(void){
void spawnQueue_func_802C39D4(void){
func_803268B4();
if(!levelSpecificFlags_validateCRC2()){
write_file_blocks(0, 0, 0x80749530, EEPROM_MAXBLOCKS);
}
}
void func_802C3A18(void){
void spawnQueue_func_802C3A18(void){
func_803283BC();
}
void func_802C3A38(void){
void spawnQueue_flush(void){
s32 i;
func_802C3BE8();
for(i = 0; i < D_80365DC4; i++){
switch(D_80365DC8[i].arg_cnt){
spawnQueue_lock();
for(i = 0; i < spawnQueueLength; i++){
switch(spawnQueue[i].arg_cnt){
case 0:
D_80365DC8[i].func0();
spawnQueue[i].func0();
break;
case 1:
D_80365DC8[i].func1(D_80365DC8[i].arg[0]);
spawnQueue[i].func1(spawnQueue[i].arg[0]);
break;
case 2:
D_80365DC8[i].func2(D_80365DC8[i].arg[0], D_80365DC8[i].arg[1]);
spawnQueue[i].func2(spawnQueue[i].arg[0], spawnQueue[i].arg[1]);
break;
case 3:
D_80365DC8[i].func3(D_80365DC8[i].arg[0], D_80365DC8[i].arg[1], D_80365DC8[i].arg[2]);
spawnQueue[i].func3(spawnQueue[i].arg[0], spawnQueue[i].arg[1], spawnQueue[i].arg[2]);
break;
case 4:
D_80365DC8[i].func4(D_80365DC8[i].arg[0], D_80365DC8[i].arg[1], D_80365DC8[i].arg[2], D_80365DC8[i].arg[3]);
spawnQueue[i].func4(spawnQueue[i].arg[0], spawnQueue[i].arg[1], spawnQueue[i].arg[2], spawnQueue[i].arg[3]);
break;
case 5:
D_80365DC8[i].func5(D_80365DC8[i].arg[0], D_80365DC8[i].arg[1], D_80365DC8[i].arg[2], D_80365DC8[i].arg[3], D_80365DC8[i].arg[4]);
spawnQueue[i].func5(spawnQueue[i].arg[0], spawnQueue[i].arg[1], spawnQueue[i].arg[2], spawnQueue[i].arg[3], spawnQueue[i].arg[4]);
break;
default:
break;
}
}
D_80365DC4 = 0;
spawnQueueLength = 0;
func_803283D4();
}
void func_802C3BDC(void){
D_80365DC0 = 0;
void spawnQueue_unlock(void){
spawnQueueLock = 0;
}
void func_802C3BE8(void){
D_80365DC0 = 1;
void spawnQueue_lock(void){
spawnQueueLock = 1;
}
void func_802C3BF8(void (* arg0)(void)){
void __spawnQueue_add_0(void (* arg0)(void)){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = arg0;
D_80365DC8[D_80365DC4].arg_cnt = 0;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = arg0;
spawnQueue[spawnQueueLength].arg_cnt = 0;
spawnQueueLength++;
}
}
void __spawnqueue_add_1(GenMethod_1 arg0, s32 arg1){
void __spawnQueue_add_1(GenMethod_1 arg0, s32 arg1){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = (void (*)(void))arg0;
D_80365DC8[D_80365DC4].arg[0] = arg1;
D_80365DC8[D_80365DC4].arg_cnt = 1;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = (void (*)(void))arg0;
spawnQueue[spawnQueueLength].arg[0] = arg1;
spawnQueue[spawnQueueLength].arg_cnt = 1;
spawnQueueLength++;
}
}
void func_802C3D3C(void (* arg0)(void), s32 arg1, s32 arg2){
void __spawnQueue_add_2(void (* arg0)(void), s32 arg1, s32 arg2){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = arg0;
D_80365DC8[D_80365DC4].arg[0] = arg1;
D_80365DC8[D_80365DC4].arg[1] = arg2;
D_80365DC8[D_80365DC4].arg_cnt = 2;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = arg0;
spawnQueue[spawnQueueLength].arg[0] = arg1;
spawnQueue[spawnQueueLength].arg[1] = arg2;
spawnQueue[spawnQueueLength].arg_cnt = 2;
spawnQueueLength++;
}
}
void func_802C3E10(void (* arg0)(void), s32 arg1, s32 arg2, s32 arg3){
void __spawnQueue_add_3(void (* arg0)(void), s32 arg1, s32 arg2, s32 arg3){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = arg0;
D_80365DC8[D_80365DC4].arg[0] = arg1;
D_80365DC8[D_80365DC4].arg[1] = arg2;
D_80365DC8[D_80365DC4].arg[2] = arg3;
D_80365DC8[D_80365DC4].arg_cnt = 3;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = arg0;
spawnQueue[spawnQueueLength].arg[0] = arg1;
spawnQueue[spawnQueueLength].arg[1] = arg2;
spawnQueue[spawnQueueLength].arg[2] = arg3;
spawnQueue[spawnQueueLength].arg_cnt = 3;
spawnQueueLength++;
}
}
void func_802C3F04(GenMethod_4 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4){
void __spawnQueue_add_4(GenMethod_4 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = (void (*)(void))arg0;
D_80365DC8[D_80365DC4].arg[0] = arg1;
D_80365DC8[D_80365DC4].arg[1] = arg2;
D_80365DC8[D_80365DC4].arg[2] = arg3;
D_80365DC8[D_80365DC4].arg[3] = arg4;
D_80365DC8[D_80365DC4].arg_cnt = 4;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = (void (*)(void))arg0;
spawnQueue[spawnQueueLength].arg[0] = arg1;
spawnQueue[spawnQueueLength].arg[1] = arg2;
spawnQueue[spawnQueueLength].arg[2] = arg3;
spawnQueue[spawnQueueLength].arg[3] = arg4;
spawnQueue[spawnQueueLength].arg_cnt = 4;
spawnQueueLength++;
}
}
void func_802C4014(void (* arg0)(void), s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5){
void __spawnQueue_add_5(void (* arg0)(void), s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = arg0;
D_80365DC8[D_80365DC4].arg[0] = arg1;
D_80365DC8[D_80365DC4].arg[1] = arg2;
D_80365DC8[D_80365DC4].arg[2] = arg3;
D_80365DC8[D_80365DC4].arg[3] = arg4;
D_80365DC8[D_80365DC4].arg[4] = arg5;
D_80365DC8[D_80365DC4].arg_cnt = 5;
D_80365DC4++;
if(tmp != spawnQueueLength){
spawnQueue[spawnQueueLength].func0 = arg0;
spawnQueue[spawnQueueLength].arg[0] = arg1;
spawnQueue[spawnQueueLength].arg[1] = arg2;
spawnQueue[spawnQueueLength].arg[2] = arg3;
spawnQueue[spawnQueueLength].arg[3] = arg4;
spawnQueue[spawnQueueLength].arg[4] = arg5;
spawnQueue[spawnQueueLength].arg_cnt = 5;
spawnQueueLength++;
}
}
@@ -594,7 +594,7 @@ Actor * func_802C42F0(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
return func_802C8F88(arg0, sp1C);
}
void func_802C4320(FunctionQueue *arg0){
if((arg0 = D_80365DC8) != NULL)
D_80365DC8 = (FunctionQueue *)defrag();
void spawnQueue_defrag(FunctionQueue *arg0){
if((arg0 = spawnQueue) != NULL)
spawnQueue = (FunctionQueue *)defrag();
}

38
src/core2/timedfuncqueue.c
View File

@@ -12,13 +12,13 @@ typedef struct timed_function_queue_s{
u8 arg_cnt;
u8 pad5[3];
union {
TFQM0 func0;
GenMethod_0 func0;
GenMethod_1 func1;
TFQM2 func2;
TFQM3 func3;
TFQM4 func4;
TFQM5 func5;
TFQM6 func6;
GenMethod_2 func2;
GenMethod_3 func3;
GenMethod_4 func4;
GenMethod_5 func5;
GenMethod_6 func6;
};
s32 arg[25];
@@ -83,7 +83,7 @@ TimedFunction* __timedFuncQueue_insert(f32 time, s32 cnt, void *funcPtr, s32 arg
retVal = (TimedFunction * )vector_insertNew((vector(TimedFunction)**)&D_80383380, ((s32)iPtr - (s32)startPtr)/(s32)sizeof(TimedFunction));
retVal->time = time;
retVal->arg_cnt = cnt;
retVal->func5 = (TFQM5) funcPtr;
retVal->func5 = (GenMethod_5) funcPtr;
retVal->arg[0] = arg0;
retVal->arg[1] = arg1;
retVal->arg[2] = arg2;
@@ -162,7 +162,7 @@ f32 func_80324C7C(void){
}
void timed_playSfx(f32 time, enum sfx_e arg0, f32 arg1, s32 arg2){
timedFunc_set_3(time, (TFQM3)func_80324A68, arg0, (s32)(arg1*1000.0f), arg2);
timedFunc_set_3(time, (GenMethod_3)func_80324A68, arg0, (s32)(arg1*1000.0f), arg2);
}
void func_80324CD8(f32 time){
@@ -170,7 +170,7 @@ void func_80324CD8(f32 time){
}
void func_80324CFC(f32 time, s32 id, s32 volume){
timedFunc_set_2(time, (TFQM2)func_80324A28, id, volume);
timedFunc_set_2(time, (GenMethod_2)func_80324A28, id, volume);
}
void func_80324D2C(f32 time, enum comusic_e arg0){
@@ -188,7 +188,7 @@ void func_80324D54(f32 time, enum sfx_e sfx_id, f32 arg2, s32 arg3, f32 position
argStruct.unkC[1] = position[1];
argStruct.unkC[2] = position[2];
timedFunc_set_6(time, (TFQM6) func_80324AA4, (void *) &argStruct);
timedFunc_set_6(time, (GenMethod_6) func_80324AA4, (void *) &argStruct);
}
void func_80324DBC(f32 time, enum asset_e text_id, s32 arg2, f32 position[3], ActorMarker *caller, void (*callback_method_1)(ActorMarker *, enum asset_e, s32), void (*callback_method_2)(ActorMarker *, enum asset_e, s32)) {
@@ -207,7 +207,7 @@ void func_80324DBC(f32 time, enum asset_e text_id, s32 arg2, f32 position[3], Ac
} else {
sp20.position[0] = sp20.position[1] = sp20.position[2] = 0.0f;
}
timedFunc_set_6(time, (TFQM6) func_80324AEC, (void *) &sp20);
timedFunc_set_6(time, (GenMethod_6) func_80324AEC, (void *) &sp20);
}
@@ -220,10 +220,10 @@ void timed_setCameraToNode(f32 time, s32 arg0){
}
void func_80324E88(f32 time){
timedFunc_set_0(time, (TFQM0) func_802BAE4C);
timedFunc_set_0(time, (GenMethod_0) func_802BAE4C);
}
void timedFunc_set_0(f32 time, TFQM0 funcPtr){
void timedFunc_set_0(f32 time, GenMethod_0 funcPtr){
__timedFuncQueue_insert(time, 0, (void *) funcPtr, 0, 0, 0, 0, 0);
}
@@ -231,23 +231,23 @@ void timedFunc_set_1(f32 time, GenMethod_1 funcPtr, s32 arg0){
__timedFuncQueue_insert(time, 1, (void *) funcPtr, arg0, 0, 0, 0, 0);
}
void timedFunc_set_2(f32 time, TFQM2 funcPtr, s32 arg0, s32 arg1){
void timedFunc_set_2(f32 time, GenMethod_2 funcPtr, s32 arg0, s32 arg1){
__timedFuncQueue_insert(time, 2, (void *) funcPtr, arg0, arg1, 0, 0, 0);
}
void timedFunc_set_3(f32 time, TFQM3 funcPtr, s32 arg0, s32 arg1, s32 arg2){
void timedFunc_set_3(f32 time, GenMethod_3 funcPtr, s32 arg0, s32 arg1, s32 arg2){
__timedFuncQueue_insert(time, 3, (void *) funcPtr, arg0, arg1, arg2, 0, 0);
}
void timedFunc_set_4(f32 time, TFQM4 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3){
void timedFunc_set_4(f32 time, GenMethod_4 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3){
__timedFuncQueue_insert(time, 4, (void *) funcPtr, arg0, arg1, arg2, arg3, 0);
}
void timedFunc_set_5(f32 time, TFQM5 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4){
void timedFunc_set_5(f32 time, GenMethod_5 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4){
__timedFuncQueue_insert(time, 5, (void *) funcPtr, arg0, arg1, arg2, arg3, arg4);
}
void timedFunc_set_6(f32 time, TFQM6 funcPtr, void* argPtr ){
void timedFunc_set_6(f32 time, GenMethod_6 funcPtr, void* argPtr ){
TimedFunction *q = __timedFuncQueue_insert(time, 6, funcPtr, 0, 0, 0, 0, 0);
memcpy(&q->arg[5], argPtr, 0x50);
}
@@ -260,7 +260,7 @@ void timedJiggySpawn(f32 time, s32 jiggyId, f32 *position){
jiggyInfo.pos[1] = position[1];
jiggyInfo.pos[2] = position[2];
timedFunc_set_6(time, (TFQM6) __spawnjiggy, (void*) &jiggyInfo);
timedFunc_set_6(time, (GenMethod_6) __spawnjiggy, (void*) &jiggyInfo);
}
bool timedFuncQueue_is_empty(void){