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/GV/code_1570.c
View File

@@ -130,7 +130,7 @@ Actor *chgobi2_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp3C[1] = this->yaw;
sp3C[2] = this->roll;
func_8033A238(func_803356A0(this->unk148));
modelRender_preDraw(func_803253A0, this);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_draw(gfx, mtx, this->position, sp3C, 1.0f, NULL, func_80330B1C(this_marker));
if(this->state == 4){

6
src/GV/code_230.c
View File

@@ -89,7 +89,7 @@ void func_803867F4(void){
func_802BAFE4(4);
if(func_80304E24(0x148, sp24)){
jiggySpawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
func_802C3F04((GenMethod_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
}
}
@@ -183,10 +183,10 @@ void chancientone_update(Actor *this){
this->position_z += (sp38 & 2) ? 0xC : -0xC;
if(this->unkF4_8 != 1){
if(sp38 == 6){
func_802C3F04((GenMethod_4)func_802C4140, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}
if(sp38 == 4 && this->position_y < LOCAL_GV_230(this)->unk1C - 600.0f){
func_802C3F04((GenMethod_4)func_802C4140, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}//L80386D80
}
if(LOCAL_GV_230(this)->unk1C <= this->position_y){

2
src/GV/code_24D0.c
View File

@@ -41,7 +41,7 @@ void chgobirope_update(Actor *this){
this->unk16C_4 = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
sp2C = func_80326D68(this->position, ACTOR_12E_GOBI_1, -1, &sp28);
sp2C = actorArray_findClosestActorFromActorId(this->position, ACTOR_12E_GOBI_1, -1, &sp28);
if(sp2C){
this->position_x = sp2C->position_x;
this->position_y = sp2C->position_y;

4
src/GV/code_2730.c
View File

@@ -71,7 +71,7 @@ Actor *func_80388C64(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp3C[0] = this->pitch;
sp3C[1] = this->yaw;
sp3C[2] = this->roll;
modelRender_preDraw(func_803253A0, this);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32) this);
func_8033A450(func_80329934());
modelRender_draw(gfx, mtx, this->position, sp3C, 1.0f, NULL,func_80330B1C(this_marker));
func_8034A174(func_80329934(), 5, local->unk0);
@@ -105,7 +105,7 @@ void func_80388DC8(Actor *this){
local->unkC = particleEmitter_new(20);
local->unk10 = particleEmitter_new(30);
GV_D_80391A60 = FALSE;
sp28 = func_80326D68(this->position, ACTOR_12E_GOBI_1, -1, &sp2C);
sp28 = actorArray_findClosestActorFromActorId(this->position, ACTOR_12E_GOBI_1, -1, &sp2C);
if(sp28){
this->position_x = sp28->position_x;
this->position_y = sp28->position_y;

4
src/GV/code_2EE0.c
View File

@@ -23,13 +23,13 @@ Actor *func_803892D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 position[3];
Actor *this;
this = func_80325300(this_marker, rotation);
this = marker_getActorAndRotation(this_marker, rotation);
if(this->unk1C[2] != 0.0f){
position[0] = this->position_x;
position[1] = this->position_y;
position[2] = this->position_z;
position[1] += 8.0f;
modelRender_preDraw(func_803253A0, this);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_draw(gfx, mtx, position, rotation, this->unk1C[0], NULL, func_80330B1C(this_marker));
}
return this;

2
src/GV/code_3D90.c
View File

@@ -70,7 +70,7 @@ void func_8038A31C(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
actor_collisionOff(this);
__spawnqueue_add_1((GenMethod_1)func_8038A2C0, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenMethod_1)func_8038A2C0, reinterpret_cast(s32, this->marker));
this->velocity[0] = 0.0f;
}

4
src/GV/code_43B0.c
View File

@@ -68,7 +68,7 @@ void func_8038A948(Actor *this){
this->initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
__spawnqueue_add_1((GenMethod_1)func_8038A8CC, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038A8CC, (s32)this->marker);
this->velocity_y = 0.0f;
}
}
@@ -84,7 +84,7 @@ void GV_func_8038A9C0(Actor *this){
this->unk16C_4 = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
__spawnqueue_add_1((GenMethod_1)func_8038A8CC, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038A8CC, (s32)this->marker);
sp24 = subaddie_getLinkedActor(this);
this->unk1C[1] = this->unk48;
this->pitch = 0.0f;

4
src/GV/code_5570.c
View File

@@ -73,7 +73,7 @@ s32 func_8038BAA4(Actor *jiggy){
sp18[0] = (s32)jiggy->position_x;
sp18[1] = (s32)jiggy->position_y;
sp18[2] = (s32)jiggy->position_z;
tmp_v0 = func_80307164(sp18, jiggy);
tmp_v0 = func_80307164(sp18);
if( tmp_v0 < 0)
return 0;
else
@@ -198,7 +198,7 @@ void GV_func_8038BEA0(Actor *this){
this->unk38_31 = 0;
D_80391A80 = this->state;
func_802BB3DC(0, 14.0f, 0.92f);
func_802C3F04((GenMethod_4)func_802C4140, 0x11f,
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x11f,
reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z)
);
}

8
src/GV/code_6370.c
View File

@@ -50,13 +50,13 @@ void func_8038C760(Actor *this, s32 arg1){
timed_setCameraToNode(0.0f, 8);
if(arg1 < 3){
timed_setCameraToNode(3.5f, arg1 + 0x15);
timedFunc_set_3(3.5f, (TFQM3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
timedFunc_set_3(3.5f, (GenMethod_3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.5f);
func_80324E38(6.5f, 0);
}
else{
timedFunc_set_2(3.5f, (TFQM2)func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_3(3.5f, (TFQM3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
timedFunc_set_2(3.5f, (GenMethod_2)func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_3(3.5f, (GenMethod_3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.0f);
func_80324E38(6.0f, 0);
}
@@ -181,7 +181,7 @@ void func_8038CC98(Actor *this){
}
if(!local->unk14){
local->unk14 = func_80326EEC(ACTOR_31D_SANDYBUTT_PYRAMID)->marker;
local->unk14 = actorArray_findActorFromActorId(ACTOR_31D_SANDYBUTT_PYRAMID)->marker;
}
if(this->state == 1){

2
src/GV/code_7FF0.c
View File

@@ -448,7 +448,7 @@ void func_8038F028(UNK_TYPE(s32) arg0, ActorMarker *arg1, s32 arg2, s32 arg3){
sp24[0] = (f32)arg1->propPtr->x;
sp24[1] = (f32)arg1->propPtr->y;
sp24[2] = (f32)arg1->propPtr->z;
func_802C3F04((GenMethod_4)func_802C4140, 0x4e, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x4e, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
func_8025A6EC(COMUSIC_2B_DING_B, 22000);
if(mapSpecificFlags_get(arg3)){
timedFunc_set_0(2.0f, func_8038F004);

6
src/GV/code_9130.c
View File

@@ -96,9 +96,9 @@ void __chmazectrl_setState(Actor *this, s32 next_state){
if(next_state == 3){
func_80324E38(0.0f, 3);
timedFunc_set_2(0.0f, (TFQM2)func_8025A6EC, COMUSIC_3E_SANDYBUTT_FAILURE, 0x7FFF);
timedFunc_set_2(1.0f, (TFQM2)__chmazectrl_markerSetState, reinterpret_cast(s32, this->marker), 6);
timedFunc_set_2(2.0f, (TFQM2)__chmazectrl_markerSetState, reinterpret_cast(s32, this->marker), 4);
timedFunc_set_2(0.0f, (GenMethod_2)func_8025A6EC, COMUSIC_3E_SANDYBUTT_FAILURE, 0x7FFF);
timedFunc_set_2(1.0f, (GenMethod_2)__chmazectrl_markerSetState, reinterpret_cast(s32, this->marker), 6);
timedFunc_set_2(2.0f, (GenMethod_2)__chmazectrl_markerSetState, reinterpret_cast(s32, this->marker), 4);
}//L8038F850
if(next_state == 4){

2
src/GV/code_9DB0.c
View File

@@ -128,7 +128,7 @@ void func_8039040C(void){
D_80391AE0.tile2_4 = NULL;
D_80391AE0.state_9 = 1;
D_80391AE0.unkC = 0.0f;
actor = func_80326EEC(0x34f);
actor = actorArray_findActorFromActorId(0x34f);
if(actor){
D_80391AE0.unk10 = actor->marker;
}