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

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]),