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

5
src/FP/code_11F0.c
View File

@@ -7,6 +7,7 @@ extern void func_80324CD8(f32);
Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038774C(Actor *this);
void func_8038794C(Actor *this);
Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]);
/* .data */
ActorAnimationInfo D_80391B80[] = {
@@ -124,7 +125,7 @@ void func_8038794C(Actor *this){
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
if(!jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)){
__spawnqueue_add_1(func_80387760, this->marker);
__spawnQueue_add_1((GenMethod_1)func_80387760, reinterpret_cast(s32, this->marker));
}
this->unk38_31 = 0;
actor_collisionOff(this);
@@ -194,7 +195,7 @@ void func_8038794C(Actor *this){
case 5://L80387D90
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
this->unk38_31 = 0;
__spawnqueue_add_1(func_80387760, this->marker);
__spawnQueue_add_1((GenMethod_1)func_80387760, reinterpret_cast(s32, this->marker));
}
break;
}

6
src/FP/code_2350.c
View File

@@ -376,7 +376,7 @@ void func_803893E4(Actor *this, f32 arg1, u8 arg2){
void func_803895E0(void){
int i;
s16 *s0;
NodeProp *s0;
f32 sp64[3];
Actor *actor;
f32 f20;
@@ -426,7 +426,7 @@ void func_803896FC(Actor *this){
func_8038B9B0(this->marker);
this->unk38_31 = 0;
func_80388C88(this);
func_802C3BF8(func_803895E0);
__spawnQueue_add_0(func_803895E0);
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
local->unk19 = 2;
this->unk4C = 900.0f;
@@ -584,7 +584,7 @@ void func_803896FC(Actor *this){
case 1: //L80389F78
if(this->unk38_31 == 2){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
__spawnqueue_add_1(func_80388F54, this->marker);
__spawnQueue_add_1((GenMethod_1)func_80388F54, reinterpret_cast(s32, this->marker));
func_8038B9BC();
marker_despawn(this->marker);
}

2
src/FP/code_4400.c
View File

@@ -54,7 +54,7 @@ void func_8038A890(void){
if(D_80392F30.unk1C){
func_802BAFE4(0x12);
jiggySpawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
func_802C3F04(func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F30.spawn_pos[0]),
reinterpret_cast(s32, D_80392F30.spawn_pos[1]),
reinterpret_cast(s32, D_80392F30.spawn_pos[2])

2
src/FP/code_45D0.c
View File

@@ -51,7 +51,7 @@ void func_8038AA60(void){
if(D_80392F50.unk18){
func_802BAFE4(0x11);
jiggySpawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
func_802C3F04(func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F50.spawn_pos[0]),
reinterpret_cast(s32, D_80392F50.spawn_pos[1]),
reinterpret_cast(s32, D_80392F50.spawn_pos[2])

6
src/FP/code_4770.c
View File

@@ -115,7 +115,7 @@ void func_8038AC90(s32 indx, s32 arg1){
}
void func_8038ADE4(s32 indx, s32 arg1){
func_802C3D3C(func_8038AC90, indx, arg1);
__spawnQueue_add_2((GenMethod_2)func_8038AC90, indx, arg1);
}
void func_8038AE14(s32 indx){
@@ -164,7 +164,7 @@ void func_8038AEE0(s32 indx){
}
void func_8038B00C(s32 indx){
__spawnqueue_add_1(func_8038AEE0, indx);
__spawnQueue_add_1((GenMethod_1)func_8038AEE0, indx);
}
void func_8038B034(void){
@@ -438,7 +438,7 @@ void func_8038B9C8(void){
func_8038ADE4(0x26, 2);
func_8038B034();
if(jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2) || jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
func_802C3BF8(func_8038B0F8);
__spawnQueue_add_0(func_8038B0F8);
}
D_803935A8.unk8 = -1;

4
src/FP/code_5CC0.c
View File

@@ -252,7 +252,7 @@ void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
func_80328A84(this, 6);
__spawnqueue_add_1(func_8038C8F0, this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
}
}
@@ -280,7 +280,7 @@ void func_8038C9A0(Actor *this){
this->velocity_z = 0.0f;
this->unk1C[0] = 0.0f;
animctrl_setAnimTimer(this->animctrl, 0.0f);
func_8038C428(this, &D_8039207C, 0);
func_8038C428(this, D_8039207C, 0);
return;
}
}//L8038CA9C

6
src/FP/code_6AE0.c
View File

@@ -368,7 +368,7 @@ void func_8038D6C8(Actor *this){
func_8038D324(this);
if(actor_animationIsAt(this, 0.999f))
__spawnqueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
if(this->velocity[0] != 0.0f)
break;
@@ -381,7 +381,7 @@ void func_8038D6C8(Actor *this){
item_set(ITEM_6_HOURGLASS, TRUE);
this->unk38_31 = 0xA;
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
__spawnqueue_add_1((GenMethod_1)func_8038D41C, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038D41C, (s32)this->marker);
this->unk60 = 0.0f;
func_80347A14(0);
func_802FAD64(ITEM_14_HEALTH);
@@ -421,7 +421,7 @@ void func_8038D6C8(Actor *this){
if(0.96 < animctrl_getAnimTimer(this->animctrl)){
if(this->unk60 <= 0.0){
__spawnqueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
this->unk60 = 2.9f;
}
else{

2
src/FP/code_8E20.c
View File

@@ -204,7 +204,7 @@ void FP_func_8038F7AC(Actor *this){
this->position[0] = local->unkC[0];\
this->position[1] = local->unkC[1];\
this->position[2] = local->unkC[2];
__spawnqueue_add_1(FP_func_8038F758, this->marker);
__spawnQueue_add_1((GenMethod_1)FP_func_8038F758, reinterpret_cast(s32, this->marker));
local->unk30 = FALSE;
}
}//L8038F910

4
src/FP/code_A40.c
View File

@@ -98,8 +98,8 @@ void chXmasTree_update(Actor *this){
func_8030DD14(this->unk44_31, 3);
sfxsource_setSampleRate(this->unk44_31, 28000);
}
func_802C3BF8(func_80386FB4);
__spawnqueue_add_1(FP_func_80386FE0, this->marker);
__spawnQueue_add_0(func_80386FB4);
__spawnQueue_add_1((GenMethod_1)FP_func_80386FE0, reinterpret_cast(s32, this->marker));
if(func_8031FF1C(0x13)){
func_80386F84(this);
mapSpecificFlags_set(2, FALSE);

4
src/FP/code_A500.c
View File

@@ -79,8 +79,8 @@ void func_80390B2C(ActorMarker *marker){
void func_80390B70(Actor *this){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timedFunc_set_1(0.6f, (GenMethod_1)func_80390ABC, this->marker);
timedFunc_set_1(2.5f, func_80390B2C, this->marker);
timedFunc_set_1(0.6f, (GenMethod_1)func_80390ABC, reinterpret_cast(s32, this->marker));
timedFunc_set_1(2.5f, (GenMethod_1)func_80390B2C, reinterpret_cast(s32, this->marker));
}
void func_80390BDC(Actor *this){

2
src/FP/code_ABD0.c
View File

@@ -228,7 +228,7 @@ void func_8039180C(Actor *this){
ActorMarker *sp24;
if(!this->initialized){
sp24 = func_80326EEC(0x254);
sp24 = actorArray_findActorFromActorId(0x254);
if(sns_get_item_state(SNS_ITEM_ICE_KEY, 1) == 1){
marker_despawn(this->marker);
}

2
src/FP/code_B4D0.c
View File

@@ -13,7 +13,7 @@ void func_803918C0(void){
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
D_803935E0.unk0 = func_8030ED2C(SFX_128_FIRE_CRACKING, 2);
func_8030DBB4(D_803935E0.unk0, 1.0f);
actor = func_80326EEC(0x353);
actor = actorArray_findActorFromActorId(0x353);
if(actor){
D_803935E0.unk4[0] = actor->position_x;
D_803935E0.unk4[1] = actor->position_y;