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/core2/bs/ant.c
View File

@@ -482,4 +482,4 @@ void bsant_drone_update(void){
void bsant_drone_end(void){
bsdrone_end();
func_8029E4EC();
}
}

6
src/core2/bs/bBarge.c
View File

@@ -51,9 +51,9 @@ void func_8029F4F0(void){
}
void func_8029F60C(void){
f32 plyrPos[3];
_player_getPosition(&plyrPos);
func_8032728C(plyrPos, 50.0f, 2, func_8029F4E0);
f32 player_position[3];
_player_getPosition(player_position);
func_8032728C(player_position, 50.0f, 2, func_8029F4E0);
}

2
src/core2/bs/bFlap.c
View File

@@ -196,4 +196,4 @@ void bsbflap_end(void) {
func_80297B94();
func_8029E090(0, 0.2f);
func_8030DA44(D_8037D30C);
}
}

8
src/core2/bs/bFly.c
View File

@@ -405,7 +405,7 @@ void func_802A411C(void) {
} else {
sp44 = 0;
}
ml_vec3f_copy(sp28, &D_8037D338);
ml_vec3f_copy(sp28, D_8037D338);
ml_vec3f_normalize(sp28);
sp24 = mlAbsF(sp34[0] * sp28[0] + sp34[1] * sp28[1] + sp34[2] * sp28[2]);
if (miscflag_isTrue(8) || ((sp44 & 0x80) != 0)) {
@@ -705,15 +705,15 @@ void func_802A4D70(void){
void func_802A4D90(void) {
f32 sp34;
f32 sp28[3];
f32 player_position[3];
f32 sp1C[3];
func_802BB3DC(2, 100.0f, 0.85f);
func_8028A274(0x10D, 1.0f);
func_8030E58C(SFX_56_BANJO_HUI, 1.0f);
_player_getPosition(&sp28);
_player_getPosition(player_position);
func_80294980(sp1C);
func_80257F18(sp1C, sp28, &sp34);
func_80257F18(sp1C, player_position, &sp34);
yaw_setIdeal(mlNormalizeAngle(sp34 + 180.0f));
yaw_applyIdeal();
func_80297970(1300.0f);

8
src/core2/bs/bbuster.c
View File

@@ -85,7 +85,7 @@ void bsbbuster_update(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
s32 sp3C;
f32 sp30[3];
s32 sp24[3];
f32 player_position[3];
D_8037D2B8 = 0;
if(animctrl_isAt(aCtrl, 0.24f))
@@ -144,8 +144,8 @@ void bsbbuster_update(void){
D_8037D2B8 = 1;
D_8037D2B0 = 0.09f;
D_8037D2BA = 3;
_player_getPosition(&sp24);
func_8032728C(sp24, 150.0f, 2, func_8029FB20);
_player_getPosition(player_position);
func_8032728C(player_position, 150.0f, 2, func_8029FB20);
if(func_802931DC(&sp3C)){
sp44 = BS_SPLAT;
}
@@ -205,4 +205,4 @@ void bsbbuster_end(void){
void func_802A02B4(s32 arg0){
D_8037D2BB = arg0;
}
}

12
src/core2/bs/beeFly.c
View File

@@ -30,15 +30,15 @@ u8 D_8037D2C0;
int bsBeeFly_inSet(s32);
void func_802A04F0(void){
f32 plyrPos[3]; //sp1C
f32 player_position[3];
_player_getPosition(&plyrPos);
plyrPos[0] += randf2(-30.0f, 30.0f);
plyrPos[1] += 30.0f + randf2(0.0f, 30.0f);
plyrPos[2] += randf2(-30.0f, 30.0f);
_player_getPosition(player_position);
player_position[0] += randf2(-30.0f, 30.0f);
player_position[1] += 30.0f + randf2(0.0f, 30.0f);
player_position[2] += randf2(-30.0f, 30.0f);
func_803541C0(3);
func_803541CC(0x50);
func_80354030(plyrPos, 0.5f);
func_80354030(player_position, 0.5f);
}

40
src/core2/bs/croc.c
View File

@@ -204,12 +204,12 @@ void bscroc_jump_init(void){
void bscroc_jump_update(void){
enum bs_e sp2C = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
f32 player_velocity[3];
func_802ABE70();
func_802ABF54();
_get_velocity(&sp1C);
if(button_released(BUTTON_A) && 0.0f < sp1C[1])
_get_velocity(player_velocity);
if(button_released(BUTTON_A) && 0.0f < player_velocity[1])
gravity_reset();
switch(D_8037D3EC){
@@ -283,12 +283,12 @@ void bscroc_fall_init(void){
void bscroc_fall_update(void){
enum bs_e next_state = 0;
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
f32 velocity[3];
f32 player_velocity[3];
func_802ABE70();
func_80299628(0);
func_802ABF54();
_get_velocity(&velocity);
_get_velocity(player_velocity);
switch(D_8037D3EC){
case 0:
@@ -328,7 +328,7 @@ void bscroc_fall_end(void){
static void __bscroc_recoil_init(s32 damage){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp38;
f32 sp2C[3];
f32 player_position[3];
f32 sp20[3];
animctrl_reset(aCtrl);
@@ -342,9 +342,9 @@ static void __bscroc_recoil_init(s32 damage){
else
func_8030E58C(SFX_56_BANJO_HUI, 1.8f);
_player_getPosition(&sp2C);
func_80294980(&sp20);
func_80257F18(&sp20, &sp2C, &sp38);
_player_getPosition(player_position);
func_80294980(sp20);
func_80257F18(sp20, player_position, &sp38);
yaw_setIdeal(mlNormalizeAngle(sp38 + 180.0f));
yaw_applyIdeal();
func_80297970(200.0f);
@@ -415,7 +415,7 @@ void bscroc_bounce_end(void){
void bscroc_die_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
f32 sp38;
f32 sp2C[3];
f32 player_position[3];
f32 sp20[3];
func_8029B930();
@@ -427,9 +427,9 @@ void bscroc_die_init(void){
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bscroc.c", 0x32b);
func_8029C7F4(1,1,2,3);
_player_getPosition(&sp2C);
func_80294980(&sp20);
func_80257F18(&sp20, &sp2C, &sp38);
_player_getPosition(player_position);
func_80294980(sp20);
func_80257F18(sp20, player_position, &sp38);
yaw_setIdeal(mlNormalizeAngle(sp38 + 180.0f));
yaw_applyIdeal();
D_8037D3E0 = 250.0f;
@@ -504,9 +504,9 @@ static void func_802ACF58(void){
f32 sp2C;
f32 sp20[3];
sp2C = func_8028B2E8() ? 500.0f : 400.0f;
func_802589E4(&sp20, yaw_get(), sp2C);
func_802589E4(sp20, yaw_get(), sp2C);
sp20[1] = 200.0f;
func_80297A0C(&sp20);
func_80297A0C(sp20);
}
void bscroc_bite_init(void){
@@ -595,13 +595,13 @@ void bscroc_eat_bad_end(void){
void func_802AD2A8(Gfx **gdl, Mtx **mPtr, void *arg2){
f32 sp34[3];
f32 player_rotation[3];
f32 sp28[3];
player_getRotation(&sp34);
func_8028E9C4(2, &sp28);
player_getRotation(player_rotation);
func_8028E9C4(2, sp28);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_draw(gdl, mPtr, &sp28, &sp34, D_8037D3F0, NULL, D_8037D3E8);
modelRender_draw(gdl, mPtr, sp28, player_rotation, D_8037D3F0, NULL, D_8037D3E8);
}
@@ -705,4 +705,4 @@ void bscroc_drone_update(void){
void bscroc_drone_end(void){
bsdrone_end();
func_802ABFBC();
}
}

25
src/core2/bs/dronexform.c
View File

@@ -42,8 +42,11 @@ void func_802AF7A0(ParticleEmitter *arg0, enum asset_e arg1){
func_802EFF50(arg0, 1.0f);
}
void func_802AF88C(Actor * arg0, f32 arg1, f32 arg2){
particleEmitter_setParticleVelocityRange(arg0, arg1*30.0f, 10.0f, arg2*30.0f, arg1*30.0f, 10.0f, arg2*30.0f);
void func_802AF88C(ParticleEmitter * arg0, f32 arg1, f32 arg2){
particleEmitter_setParticleVelocityRange(arg0,
arg1*30.0f, 10.0f, arg2*30.0f,
arg1*30.0f, 10.0f, arg2*30.0f
);
func_802EFB70(arg0, D_8037D470.unk14, D_8037D470.unk14);
}
@@ -55,7 +58,7 @@ void func_802AF900(void){
f32 sp3C;
f32 sp30[3];
player_getPosition(&sp30);
player_getPosition(sp30);
sp3C = D_8037D470.unk8;
sp48 = func_80257A44(sp3C, 0.38f);
sp4C = sp48 * 6.283185308;
@@ -65,16 +68,16 @@ void func_802AF900(void){
sp30[1] += func_80257C48(func_80257A44(sp3C, 1.14f), 0.0f, 130.0f);
sp30[2] += sp44 * D_8037D470.unk18;
func_802AF88C(D_8037D470.unk4, sp40, sp44);
particleEmitter_setPosition(D_8037D470.unk4, &sp30);
particleEmitter_setPosition(D_8037D470.unk4, sp30);
particleEmitter_emitN(D_8037D470.unk4, 1);
player_getPosition(&sp30);
player_getPosition(sp30);
sp4C = (1.0 - func_802588B0(sp48 + 0.5, 1.0f))* 6.283185308;
sp30[0] -= sinf(sp4C) * D_8037D470.unk18;
sp30[1] += func_80257C48(func_80257A44(sp3C, 1.14f), 130.0f, 0.0f);
sp30[2] -= cosf(sp4C) * D_8037D470.unk18;
func_802AF88C(D_8037D470.unk0, sp40, sp44);
particleEmitter_setPosition(D_8037D470.unk0, &sp30);
particleEmitter_setPosition(D_8037D470.unk0, sp30);
particleEmitter_emitN(D_8037D470.unk0, 1);
}
@@ -110,7 +113,7 @@ void func_802AFBAC(f32 arg0){
D_8037D470.unk14 = arg0;
}
void func_802AFBB8(f32 (* arg0)[3]){
void func_802AFBB8(f32 arg0[3]){
static struct41s D_80364BB0 = {
{{-150.0f, 10.0f, -150.0f}, { 150.0f, 50.0f, 150.0f}},
{{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}}
@@ -276,10 +279,10 @@ static void __bsdronexform_setState(int arg0){
break;
case 5:// 802B02F4
_player_getPosition(&sp24);
_player_getPosition(sp24);
sp24[1] += 30.0f;
func_8024E3A8(&sp24, 80.0f);
func_802AFBB8(&sp24);
func_8024E3A8(sp24, 80.0f);
func_802AFBB8(sp24);
func_8029E3C0(0, 0.1f);
break;
@@ -443,4 +446,4 @@ void bsdronexform_end(void){
miscflag_clear(MISC_FLAG_1B_TRANSFORMING);
}
void bsdronexform_interrupt(void){};
void bsdronexform_interrupt(void){}

8
src/core2/bs/jump.c
View File

@@ -95,7 +95,7 @@ void bsjump_update(void){
func_802B6FA8();
}
_get_velocity(&velocity);
_get_velocity(velocity);
if((button_released(BUTTON_A) && 0.0f < velocity[1] && !D_8037D4C2) || !can_control_jump_height()){
gravity_reset();
}
@@ -189,14 +189,14 @@ void bsjump_fall_init(void){
void bsjump_fall_update(void){
enum bs_e sp2C = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
f32 player_velocity[3];
if(miscflag_isTrue(0xf))
func_802978A4();
else
func_802B6FA8();
_get_velocity(&sp1C);
_get_velocity(player_velocity);
switch(D_8037D4C0){
case 0://L802B17B8
@@ -245,7 +245,7 @@ void bsjump_fall_update(void){
bs_setState(sp2C);
}
void bsjump_fall_end(void){};
void bsjump_fall_end(void){}
void func_802B1928(void) {
AnimCtrl *anim_ctrl;

12
src/core2/bs/throw.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
extern ActorMarker *carriedobj_getMarker(void);
/* .bss */
u8 D_8037D580;
@@ -28,16 +30,16 @@ void bsthrow_update(void){
enum bs_e next_state = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp34[3];
f32 sp28[3];
f32 player_position[3];
f32 sp24;
ActorMarker *sp20 = carriedobj_getMarker();
if(D_8037D580 == 0 && sp20 != NULL)
func_802948F8(sp20);
_player_getPosition(&sp28);
func_80294A1C(&sp34);
func_80257F18(&sp28, &sp34, &sp24);
_player_getPosition(player_position);
func_80294A1C(sp34);
func_80257F18(player_position, sp34, &sp24);
yaw_setIdeal(sp24);
if(animctrl_isAt(aCtrl, 0.35f) && sp20){
@@ -71,4 +73,4 @@ void bsthrow_interrupt(void){
else{ //L802B6748
func_80296608();
}
}
}

2
src/core2/bs/walrus.c
View File

@@ -774,4 +774,4 @@ void bswalrus_sled_drone_update(void){
void bswalrus_sled_drone_end(void){
bsdrone_end();
func_802B80D0();
}
}