address variaty of compiler warnings and code documentation

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

View File

@@ -94,7 +94,7 @@ void func_803865D0(ActorMarker *marker){
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
RBB_func_803863F0(actor, 1);
timed_setCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (TFQM2) func_803865A4, actor->marker, 4);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenMethod_2) func_803865A4, actor->marker, 4);
func_80324E88(0.75*D_80390074[local->unk4].unk4);
func_80324E38(0.75*D_80390074[local->unk4].unk4, 0);
timed_playSfx(D_80390074[local->unk4].unk4, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0);
@@ -113,7 +113,7 @@ void func_803866F4(Actor *this, s32 arg1){
local->unk8++;
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.5f, (TFQM2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_2(0.5f, (GenMethod_2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_1(1.0f, (GenMethod_1) func_803865D0, this->marker);
}//L803867D4
if(arg1 == 4){
@@ -166,4 +166,4 @@ void func_803868F0(Actor *this){
}
}
}
}

View File

@@ -187,15 +187,15 @@ void func_80387F88(ActorMarker *marker){
timed_playSfx(3.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.6f, 22000);
func_80324E88(4.0f);
func_80324E38(4.0f, 0);
timedFunc_set_2(4.0f, (TFQM2) RBB_func_80387F18, (s32) actor->marker, 3);
timedFunc_set_2(4.0f, (GenMethod_2) RBB_func_80387F18, (s32) actor->marker, 3);
}
void func_80388154(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
func_803879F0();
timedFunc_set_0(0.0f, (TFQM0) RBB_func_80387F44);
timedFunc_set_0(0.0f, (GenMethod_0) RBB_func_80387F44);
timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6);
timedFunc_set_2(1.2f, (TFQM2) func_80387B8C, 0x19f, 0);
timedFunc_set_2(1.2f, (GenMethod_2) func_80387B8C, 0x19f, 0);
timed_setCameraToNode(1.2f, 8);
timedFunc_set_1(1.5f, (GenMethod_1) func_80387F88, (s32) actor->marker);
}
@@ -204,8 +204,8 @@ void func_803881E8(Actor *this, s32 arg1){
this->state = arg1;
if(this->state == 2){
RBB_func_80387960(0.05f);
timedFunc_set_2(0.05f, (TFQM2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(0.05f, (GenMethod_2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
timed_setCameraToNode(1.1f, 7);
timedFunc_set_1(1.6f, (GenMethod_1)func_80388154, (s32)this->marker);
@@ -233,4 +233,4 @@ void RBB_func_803882F4(Actor *this){
func_803881E8(this, 1);
}
}
}
}

View File

@@ -93,11 +93,11 @@ void func_80389C78(Actor *this){
if(levelSpecificFlags_get(local->unk8 ? 4 : 3)){
set_camera_to_node(9);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.1f, (TFQM2)levelSpecificFlags_set, local->unk8 ? 0x28 : 0x27, 1);
timedFunc_set_2(0.1f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x28 : 0x27, 1);
func_80324E88(4.5f);
func_80324E38(4.5f, 0);
timedFunc_set_2(4.5f, (TFQM2)levelSpecificFlags_set, local->unk8 ? 0x4 : 0x3, 0);
timedFunc_set_3(4.5f, (TFQM3)func_802E4078, MAP_34_RBB_ENGINE_ROOM, !local->unk8 ? 3 : 2, 0);
timedFunc_set_2(4.5f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x4 : 0x3, 0);
timedFunc_set_3(4.5f, (GenMethod_3)func_802E4078, MAP_34_RBB_ENGINE_ROOM, !local->unk8 ? 3 : 2, 0);
func_803228D8();
}
}//L80389EA8
@@ -126,4 +126,4 @@ void func_80389C78(Actor *this){
local->unkC = MAX(local->unk4, local->unkC);
}
}//L8038A08C
}
}

View File

@@ -49,7 +49,7 @@ void RBB_func_8038A0A0(Actor *this, s32 arg1){
levelSpecificFlags_set(local->unk0->unk8, 1);
func_803228D8();
timedFunc_set_1(1.1f, (GenMethod_1)func_8028F9DC, 2);
timedFunc_set_3(1.1f, (TFQM3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
timedFunc_set_3(1.1f, (GenMethod_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}else{
levelSpecificFlags_set(local->unk0->unkA, 1);
}

View File

@@ -74,7 +74,7 @@ void func_8038AC18(Actor *this, s32 new_state){
mapSpecificFlags_set(local->unk4->unk10, TRUE);
this->position_y -= 30.0f;
local->unk8 = 1.0f;
other = func_80326EEC(0x1c5);
other = actorArray_findActorFromActorId(0x1c5);
if(other){
local->unk0 = func_8038B56C(other, this->modelCacheIndex - 0x1be, this);
}

View File

@@ -86,7 +86,7 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
-5.0f, -5.0f, 0.0f,
5.0f, 5.0f, 0.0f
);
particleEmitter_setPosition(other, &local->unk4);
particleEmitter_setPosition(other, local->unk4);
particleEmitter_setParticleVelocityRange(other,
-400.0f, 0.0f, -30.0f,
-800.0f, 0.0f, 30.0f

View File

@@ -23,7 +23,7 @@ void func_8038B6E0(Actor *this, s32 arg1){
levelSpecificFlags_set(0x30, TRUE);
func_803204E4(0xe, 1);
timedFunc_set_0(1.0f, func_803228D8);
timedFunc_set_3(1.0f, (TFQM3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
timedFunc_set_3(1.0f, (GenMethod_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}
}
this->state = arg1;
@@ -44,4 +44,4 @@ void func_8038B7E8(Actor *this){
else
func_8038B6E0(this, 1);
}
}
}

View File

@@ -41,9 +41,9 @@ void func_8038C0FC(Actor *this, s32 new_state){
set_camera_to_node(0xC);
func_80324E38(0.0f, 3);
timedFunc_set_0(1.0f, func_8038C000);
timedFunc_set_2(1.0f, (TFQM2)mapSpecificFlags_set, 8, TRUE);
timedFunc_set_2(1.0f, (GenMethod_2)mapSpecificFlags_set, 8, TRUE);
timed_playSfx(2.1f, SFX_3F6_UNKNOWN, 0.6f, 0x7fbc);
timedFunc_set_2(2.7f, (TFQM2)mapSpecificFlags_set, 4, TRUE);
timedFunc_set_2(2.7f, (GenMethod_2)mapSpecificFlags_set, 4, TRUE);
timedFunc_set_0(3.0f, func_8038C058);
func_80324DBC(3.0f, 0xb9C, 7, NULL, this->marker, func_8038C0A8, NULL);
}//L8038C1D8
@@ -66,6 +66,6 @@ void func_8038C204(Actor *this){
func_80324E88(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_0(0.0f, func_803228D8);
timedFunc_set_3(0.0f, (TFQM3)func_802E4078, MAP_8B_RBB_ANCHOR_ROOM, 2, 0);
timedFunc_set_3(0.0f, (GenMethod_3)func_802E4078, MAP_8B_RBB_ANCHOR_ROOM, 2, 0);
}//L8038C2E4
}
}

View File

@@ -16,4 +16,4 @@ void func_8038C300(Actor *this){
this->unk16C_4 = 1;
func_80335924(this->unk148, 0x140, 0.0f, 1.0f);
}
}
}

View File

@@ -105,7 +105,7 @@ void func_8038C39C(Actor *this){
func_802EFA5C(other, 0.0f, 0.1f);
particleEmitter_setStartingFrameRange(other, 0, 7);
func_802EFA70(other, 4);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
func_802EFB84(other, 3.0f*local->unk0->unk4, local->unk0->unk4*7.0f);
particleEmitter_setParticleSpawnPositionRange(other,
@@ -127,7 +127,7 @@ void RBB_func_8038C538(Actor *this){
func_802EFA5C(other, 0.1f, 0.3f);
func_802EFA70(other, 4);
particleEmitter_setStartingFrameRange(other, 0, 7);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*6.0f);
func_802EFB84(other, 0.5*local->unk0->unk4, local->unk0->unk4*3.0f);
particleEmitter_setParticleSpawnPositionRange(other,
@@ -156,7 +156,7 @@ void RBB_func_8038C70C(Actor *this){
local->unk0->unk4 * -300.0f, local->unk0->unk4 * 100.0f, local->unk0->unk4 * -300.0f,
local->unk0->unk4 * 300.0f, local->unk0->unk4 * 200.0f, local->unk0->unk4 * 300.0f
);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, local->unk0->unk4*0.3, local->unk0->unk4*0.8);
func_802EFE24(other,
-600.0f, -600.0f, -600.0f,
@@ -182,7 +182,7 @@ void func_8038C8A8(Actor * this){
func_802EFA5C(other, 0.0, 0.5f);
func_802EFA70(other, 4);
particleEmitter_setStartingFrameRange(other, 0, 7);
particleEmitter_setPosition(other, &sp24);
particleEmitter_setPosition(other, sp24);
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
func_802EFB84(other, local->unk0->unk4*3.0f, local->unk0->unk4*6.0f);
particleEmitter_setPositionVelocityAndAccelerationRanges(other, &D_80390CA8);
@@ -191,14 +191,14 @@ void func_8038C8A8(Actor * this){
particleEmitter_emitN(other, 5);
}
void func_8038C9F0(s32 arg0, s32 arg1, s32 arg2){
Actor *actor = func_80326EEC(0x46);
if(actor)
marker_despawn(actor->marker);
void chbossboombox_respawnJiggy(s32 position_x, s32 position_y, s32 position_z){
Actor *jiggy = actorArray_findActorFromActorId(ACTOR_46_JIGGY);
if(jiggy)
marker_despawn(jiggy->marker);
D_80391288[0] = (f32)arg0;
D_80391288[1] = (f32)(arg1 + 0x28);
D_80391288[2] = (f32)arg2;
D_80391288[0] = (f32)position_x;
D_80391288[1] = (f32)(position_y + 0x28);
D_80391288[2] = (f32)position_z;
jiggySpawn(JIGGY_56_RBB_BOSS_BOOM_BOX, &D_80391288);
}
@@ -230,13 +230,13 @@ void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
func_80324E88(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_2(0.0f, (TFQM2)RBB_func_8038C370, actor->marker, 3);
timedFunc_set_2(0.0f, (GenMethod_2)RBB_func_8038C370, actor->marker, 3);
}
void func_8038CBC0(void){
Actor * actor = func_80326EEC(0x46);
if(actor)
func_802C8090(actor);
void chbossboombox_hideJiggy(void){
Actor * jiggy = actorArray_findActorFromActorId(ACTOR_46_JIGGY);
if(jiggy)
chjiggy_hide(jiggy);
}
int RBB_func_8038CBF0(Actor *this){
@@ -280,7 +280,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
sp80[1] = sp8C[1] - this->position_y;
sp80[2] = sp8C[2] - this->position_z;
if(this->state == 2){
func_8038CBC0();
chbossboombox_hideJiggy();
}
if(this->state == 7){
@@ -320,10 +320,10 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
item_set(ITEM_0_HOURGLASS_TIMER, 0x1067);
func_80324E88(2.4f);
func_80324E38(2.4f, 0);
timedFunc_set_2(2.4f, (TFQM2)RBB_func_8038C370, (s32)this->marker, 3);
timedFunc_set_2(2.4f, (GenMethod_2)RBB_func_8038C370, (s32)this->marker, 3);
}
else{//L8038CEFC
timedFunc_set_3(2.4f, (TFQM3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
timedFunc_set_3(2.4f, (GenMethod_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
func_80324DBC(2.4f, 0xb9e, 4, NULL, this->marker, func_8038CB34, func_8038CB68);
}
}//L8038CF60
@@ -368,7 +368,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
func_803204E4(5, 1);
}
else{//L8038D220
timedFunc_set_3(0.0f, (TFQM3)func_8038C9F0, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
timedFunc_set_3(0.0f, (GenMethod_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
func_80311480(0xb9f, 4, 0, 0, 0, 0);
}
}//L8038D278
@@ -377,12 +377,12 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
sp68[0] = this->position_x + 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z;
func_802C3F04(func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
sp68[0] = this->position_x - 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z;
func_802C3F04(func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
}
}//L8038D378
@@ -452,7 +452,7 @@ void func_8038D608(ActorMarker *marker, ActorMarker *other){
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){
f32 sp3C[3];
Actor *actor = func_80325300(marker, &sp3C);
Actor *actor = marker_getActorAndRotation(marker, &sp3C);
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &actor->local;
func_8033A45C(1, local->unk0->unkD);
if(local->unk0->unkD == 1){
@@ -529,10 +529,10 @@ void func_8038D8BC(Actor *this){
marker_despawn(this->marker);
if(func_803203FC(2))
func_8038CBC0();
chbossboombox_hideJiggy();
if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
func_8038CBC0();
chbossboombox_hideJiggy();
func_80335924(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
func_80335A8C(this->unk148, 2);
this->state = 2;

View File

@@ -24,8 +24,8 @@ void func_8038DE68(Actor *this){
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2)){
marker_despawn(this->marker);
}else{
func_802C3F04(func_802C4140, 0x281, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x281, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));
func_8038DE50(this, 1);
}
}//L8038DEF4
}
}

View File

@@ -62,7 +62,7 @@ void func_8038DF6C(Actor* this){
if(++local->unk20 == 2){
for(i = 0x5e; i < 0x63; i++){
other = func_80326D68(this->position, i, -1, &sp58);
other = actorArray_findClosestActorFromActorId(this->position, i, -1, &sp58);
if(sp58 < 300.0f){
local->unk4 = other->marker;
other->position_x = this->position_x;

View File

@@ -75,7 +75,7 @@ void func_8038E998(Actor *this){
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
func_802EFA5C(other, 0.0f, 0.1f);
particleEmitter_setStartingFrameRange(other, 0, 7);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, 0.25f, 0.75f);
func_802EFB84(other, 0.75f, 1.75f);
particleEmitter_setParticleSpawnPositionRange(other, -50.0f, 25.0f, -50.0f, 50.0f, 25.0f, 50.0f);
@@ -94,7 +94,7 @@ void func_8038EAB4(Actor *this){
particleEmitter_setStartingFrameRange(other, 0, 0);
particleEmitter_setParticleFramerateRange(other, 4.0f, 4.0f);
particleEmitter_setParticleSpawnPositionRange(other, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, 3.0f, 3.0f);
func_802EFB84(other, 8.0f, 8.0f);
func_802EFEC0(other, 0.5f, 0.5f);
@@ -108,7 +108,7 @@ void func_8038EC14(Actor *this){
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
func_802EFA5C(other, 0.05f, 0.1f);
particleEmitter_setStartingFrameRange(other, 0, 7);
particleEmitter_setPosition(other, &this->position);
particleEmitter_setPosition(other, this->position);
func_802EFB70(other, 1.0f, 1.5f);
func_802EFB84(other, 2.0f, 3.0f);
particleEmitter_setParticleSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
@@ -124,7 +124,7 @@ void func_8038ED3C(Actor * actor, s32 arg1){
func_802EF9F8(other, 0.6f);
func_802EFA18(other, 3);
particleEmitter_setModel(other, arg1);
particleEmitter_setPosition(other, &actor->position);
particleEmitter_setPosition(other, actor->position);
func_802EFB70(other, 0.05f, 0.4f);
func_802EFE24(other, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setSpawnIntervalRange(other, 0.0f, 0.01f);

View File

@@ -26,7 +26,7 @@ void RBB_func_8038FA60(ActorMarker *marker){
void func_8038FA9C(Actor *this, s32 arg1){
if(arg1 == 3){
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(1.0f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timed_setCameraToNode(1.8f, 1);
timedFunc_set_1(2.0f, (GenMethod_1) RBB_func_8038FA60, (s32)this->marker);
func_80324E88(5.0f);

View File

@@ -50,7 +50,7 @@ void func_8038FC48(Actor *this){
}
else{//L8038FD34
if(local->unk8 == NULL)
local->unk8 = func_80326EEC(*local->unk4)->marker;
local->unk8 = actorArray_findActorFromActorId(*local->unk4)->marker;
sp20 = func_8038A6B8(local->unk8);
tmp_f2 = 1.5* sp20 + 0.5;
func_802F9DB8(local->unk0, tmp_f2, tmp_f2, 0.0f);

View File

@@ -65,4 +65,4 @@ void func_8038FF70(void){
if(D_803912C8 == 3)
func_8038FDE0(0);
}
}

View File

@@ -64,7 +64,7 @@ void func_8038718C(ActorMarker *marker){
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 19000);\
func_80324E88(5.0f);
func_80324E38(5.0f, 0);
timedFunc_set_2(5.0f, (TFQM2) func_80387090, (s32) marker, 3);
timedFunc_set_2(5.0f, (GenMethod_2) func_80387090, (s32) marker, 3);
}
void func_80387308(ActorMarker *marker){
@@ -86,9 +86,9 @@ void func_80387308(ActorMarker *marker){
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 19000);
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 0.9f, 19000);
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 19000);
timedFunc_set_2(0.5f, (TFQM2) func_80387090, (s32) actor->marker, 1);
timedFunc_set_2(0.5f, (GenMethod_2) func_80387090, (s32) actor->marker, 1);
timedFunc_set_2(1.5f, (TFQM2) func_803870BC, 0x19d, 0x1f4);
timedFunc_set_2(1.5f, (GenMethod_2) func_803870BC, 0x19d, 0x1f4);
func_80324E88(1.5f);
func_80324E38(1.5f, 0);