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/TTC/ch/treasure.c
View File

@@ -22,7 +22,7 @@ ActorInfo gChTreasureInfo = {
/* .code */
void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){
Actor *this = marker_getActor(marker);
func_802C3F04((GenMethod_4) func_802C4140, 0x4C, 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, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f);
func_803115C4(0xA19);
jiggySpawn(JIGGY_11_TTC_RED_X, this->position);

6
src/TTC/code_0.c
View File

@@ -50,8 +50,8 @@ bool TTC_func_803864B0(Actor *this, f32 arg1) {
f32 sp3C[3];
s32 sp38;
sp50 = func_80326D68(this->position, 0x52, -1, &sp5C);
sp4C = func_80326D68(this->position, 0x129, -1, &sp58);
sp50 = actorArray_findClosestActorFromActorId(this->position, 0x52, -1, &sp5C);
sp4C = actorArray_findClosestActorFromActorId(this->position, 0x129, -1, &sp58);
sp38 = 0;
if( (sp58 < sp5C)
&& (sp58 < 16000.0f)
@@ -241,7 +241,7 @@ void func_80386EDC(s32 this, enum item_e item_id){
player_getPosition(sp24);
func_802C8F70(randf2(0.0f, 359.0f));
func_802C3F04(func_802C4218, this, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4218, this, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
item_dec(item_id);
}

2
src/TTC/code_10A0.c
View File

@@ -69,7 +69,7 @@ void func_80387574(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(func_80304E24(0x14b, sp24)){
jiggySpawn(JIGGY_14_TTC_BLUBBER, sp24);
func_802C3F04((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
}
}

2
src/TTC/code_19D0.c
View File

@@ -341,6 +341,6 @@ bool func_80388A44(s16 arg0[3]){
sp1C[1] = (f32) arg0[1];
sp1C[2] = (f32) arg0[2];
nipper = func_80326D68(sp1C, ACTOR_117_NIPPER, -1, NULL);
nipper = actorArray_findClosestActorFromActorId(sp1C, ACTOR_117_NIPPER, -1, NULL);
return nipper->state == 7;
}

2
src/TTC/code_26D0.c
View File

@@ -135,7 +135,7 @@ void func_80388D04(s32 arg0){
void func_80388D34(Actor *this){
TTC_func_80388C78(this);
if(!this->unk16C_4){
__spawnqueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker);
this->unk16C_4 = TRUE;
}
}

2
src/TTC/code_2B80.c
View File

@@ -94,7 +94,7 @@ void func_80389288(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timedFunc_set_0(1.0f, func_80388F88);
func_80324E38(2.5f, 0);
timedFunc_set_1(2.5f, func_8028F9DC, 2);
timedFunc_set_3(2.5f, (TFQM3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0);
timedFunc_set_3(2.5f, (GenMethod_3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0);
func_803228D8();
}

10
src/TTC/code_35D0.c
View File

@@ -123,8 +123,8 @@ void func_80389B38(s32 arg0){
}
D_8037DCB4++;
func_802C3BF8(func_80389A9C);
func_802C3BF8(func_80389A1C);
__spawnQueue_add_0(func_80389A9C);
__spawnQueue_add_0(func_80389A1C);
}
}
@@ -157,7 +157,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2];
D_8038D708[1] = func_80309724(D_8038D708);
func_802C3F04((GenMethod_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
D_8038D700 = partEmitList_pushNew(3);
func_802EFFA8(D_8038D700, D_8038C91C);
particleEmitter_setSprite(D_8038D700, ASSET_700_SPRITE_DUST);
@@ -168,7 +168,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
particleEmitter_emitN(D_8038D700, 5);
D_8038D708[2] += 300.0f;
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (TFQM2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_2(0.1f, (GenMethod_2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_1(0.1f, (GenMethod_1) gcpausemenu_80314AC8, 1);
func_80311480(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
D_8037DCB4++;
@@ -219,7 +219,7 @@ Actor *func_8038A0D0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp38;
Actor *actor;
actor = func_80325300(marker, sp4C);
actor = marker_getActorAndRotation(marker, sp4C);
switch(marker->modelId){
case ASSET_3E9_MODEL_RED_ARROW://L8038A12C
sp3C = 1.0f;

2
src/TTC/code_3E30.c
View File

@@ -408,7 +408,7 @@ void func_8038B094(void){
func_80324E88(2.0f);
func_80324E38(2.0f, 0);
func_803228D8();
timedFunc_set_3(2.0f, (TFQM3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0);
timedFunc_set_3(2.0f, (GenMethod_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0);
}
else if(levelSpecificFlags_get(2) || func_803203FC(2)){
func_8034E71C(sp2C, -500, 0.0f);