kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

misc documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-30 00:02:44 -06:00
parent da9a0109b5
commit cd146f444f
258 changed files with 2526 additions and 3594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ void func_8029E48C(void){
func_80297970(0.0f);
}
else{
func_80297970(func_80257C48(sp1C, D_80364960, D_80364964));
func_80297970(ml_interpolate_f(sp1C, D_80364960, D_80364964));
}
}
@@ -304,7 +304,7 @@ static void __bsant_recoil_init(int take_damage){
func_8029C7F4(1,1,2,3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
D_8037D294 = 0;
}
@@ -335,7 +335,7 @@ static void __bsant_recoil_update(void){
static void __bsant_recoil_end(void){
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_8029E4EC();
}
@@ -396,7 +396,7 @@ void bsant_die_init(void){
func_802BF2C0(30.0f);
func_8029C984();
D_8037D294 = 0;
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_8029E3C0(0, 2.9f);
}

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

@@ -20,7 +20,7 @@ void _bsbflip_802A2D60(void){
if(!func_8029B300())
func_80297970(0.0f);
else
func_80297970(func_80257C48(sp1C, D_80364A2C, D_80364A30));
func_80297970(ml_interpolate_f(sp1C, D_80364A2C, D_80364A30));
}
void _bsbflip_802A2DC0(void){

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

@@ -3,7 +3,7 @@
#include "variables.h"
extern void func_8028FDC8(f32);
extern void playerModel_setYDisplacement(f32);
extern void baModel_setYDisplacement(f32);
extern f32 func_8029B2D0(void);
extern void func_802BFE50(f32, f32, f32);
extern void func_80354030(f32[3], f32);
@@ -47,7 +47,7 @@ void func_802A3404(void){
}
void func_802A3430(void){
playerModel_setYDisplacement(60.0f);
baModel_setYDisplacement(60.0f);
func_802991A8(3);
func_80299234(500.0f, 2.0f);
roll_setAngularVelocity(500.0f, 2.0f);
@@ -63,7 +63,7 @@ void func_802A34C8(void){
gravity_reset();
func_80297B94();
func_8029E070(0);
playerModel_setYDisplacement(0.0f);
baModel_setYDisplacement(0.0f);
func_8029CB84();
func_802991A8(1);
func_80291548();
@@ -287,7 +287,7 @@ void bsbfly_update(void){
if(should_beak_bust())
sp54 = BS_F_BBUSTER;
D_8037D320 = max_f(D_8037D320 - time_getDelta(), 0.0f);
D_8037D320 = ml_max_f(D_8037D320 - time_getDelta(), 0.0f);
if( D_8037D320 == 0.0f
&& button_pressed(BUTTON_B)
&& can_beak_bomb()
@@ -462,7 +462,7 @@ void func_802A4430(void){
pitch_setIdeal(0.0f);
gravity_reset();
func_80297B94();
playerModel_setYDisplacement(0.0f);
baModel_setYDisplacement(0.0f);
func_80299CF4(SFX_31_BANJO_OHHWAAOOO, 1.0f, 0x7fff);
func_80299D2C(SFX_61_CARTOONY_FALL, 1.0f, 0x7fff);
D_8037D320 = 0.35f;
@@ -532,10 +532,10 @@ void func_802A4748(void) {
func_8029E070(1);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
func_80299CF4(SFX_36_BANJO_DOH, 1.0f, 28000);
func_80250D94(1.0f, 0.5f, 0.5f);
rumbleManager_80250D94(1.0f, 0.5f, 0.5f);
item_dec(ITEM_14_HEALTH);
func_802A46C8();
func_8028D5DC();
baMarker_collisionOff();
D_8037D344 = 0;
}
@@ -612,7 +612,7 @@ void func_802A4A40(void) {
func_80291548();
func_8029CB84();
func_8029E070(0);
func_8028D5F4();
baMarker_collisionOn();
}
void func_802A4A78(s32 arg0) {
@@ -633,7 +633,7 @@ void func_802A4A78(s32 arg0) {
func_802BB3DC(2, 100.0f, 0.85f);
func_8028A274(0xD3, 1.2f);
func_80299BFC(1.0f);
func_80250D94(1.0f, 0.5f, 0.5f);
rumbleManager_80250D94(1.0f, 0.5f, 0.5f);
_player_getPosition(sp3C);
func_80294980(sp30);
func_80257F18(sp30, sp3C, &sp28);
@@ -653,7 +653,7 @@ void func_802A4A78(s32 arg0) {
func_8029E070(1);
func_802914CC(4);
func_802BFE50(12.0f, 10000.0f, 800.0f);
func_8028D5DC();
baMarker_collisionOff();
func_802A3430();
}
@@ -672,7 +672,7 @@ void func_802A4C34(s32 arg0) {
void func_802A4C88(s32 arg0) {
func_80297B3C();
func_8028D5F4();
baMarker_collisionOn();
func_80297CA8();
func_8029E070(0);
func_80291548();
@@ -726,7 +726,7 @@ void func_802A4D90(void) {
func_8029C7F4(1, 1, 2, 3);
player_setYVelocity(400.0f);
gravity_set(-1800.0f);
func_8028D5DC();
baMarker_collisionOff();
func_802914CC(4);
func_802BFE50(12.0f, 10000.0f, 800.0f);
}
@@ -749,7 +749,7 @@ void func_802A4EC8(void) {
void func_802A4F44(void){
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_802A34C8();
}

16
src/core2/bs/bLongLeg.c
View File

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/playerModel.h"
#include "core2/ba/model.h"
/* .data */
const f32 D_80364A40 = 80.0f;
@@ -38,7 +38,7 @@ void func_802A524C(void){
if(!func_8029B300())
func_80297970(0.0f);
else
func_80297970(func_80257C48(sp1C, D_80364A40, D_80364A44));
func_80297970(ml_interpolate_f(sp1C, D_80364A40, D_80364A44));
}
int bslongleg_inSet(s32 move_indx){
@@ -58,7 +58,7 @@ void func_802A531C(void){
}
void func_802A5374(void){
playerModel_80292078(1, -50.0f);
baModel_80292078(1, -50.0f);
func_8029B324(0, 0.03f);
func_8029B324(1, 1.0f);
func_8029E070(1);
@@ -73,12 +73,12 @@ void func_802A5404(void){
if(bslongleg_inSet(bs_getNextState()))
return;
playerModel_80292078(1,0);
baModel_80292078(1,0);
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_8029E0F4(0);
playerModel_setDirection(PLAYER_MODEL_DIR_BANJO);
baModel_setDirection(PLAYER_MODEL_DIR_BANJO);
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_802917C4(2);
@@ -155,7 +155,7 @@ void bsblongleg_stand_enter(void){
func_8028A010(ASSET_41_ANIM_BSLONGLEG_IDLE, 1.0f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
playerModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
func_802A5374();
}
@@ -428,7 +428,7 @@ void bsblongleg_slide_update(void){
func_802A531C();
func_80299AAC();
D_8037D358 = max_f(D_8037D358 - time_getDelta(), 0.0f);
D_8037D358 = ml_max_f(D_8037D358 - time_getDelta(), 0.0f);
if(player_isSliding()){
func_80294480(sp30);
@@ -463,7 +463,7 @@ void func_802A6394(void){
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A5374();
playerModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
func_8029C674();
}

14
src/core2/bs/bPeck.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
void playerModel_80292048(s32, f32, f32, f32);
void baModel_80292048(s32, f32, f32, f32);
void func_802875AC(AnimCtrl *, char *, s32);
/* .data */
@@ -42,9 +42,9 @@ void bsbpeck_init(void){
func_8029E070(1);
gravity_set(D_80364A60);
player_setYVelocity(D_80364A64);
playerModel_80292048(1, -38.0f, 0.0f, 105.0f);
playerModel_80292048(0, -38.0f, 0.0f, -7.0f);
func_8028D638(0x23, 0x2A);
baModel_80292048(1, -38.0f, 0.0f, 105.0f);
baModel_80292048(0, -38.0f, 0.0f, -7.0f);
baMarker_8028D638(0x23, 0x2A);
D_8037D375 = 0;
D_8037D374 = 0;
D_8037D376 = 1;
@@ -129,9 +129,9 @@ void bsbpeck_update(void){
void bsbpeck_end(void){
D_8037D376 = 0;
ability_use(0xa);
playerModel_80292048(1, 0.0f, 0.0f, 0.0f);
playerModel_80292048(0, 0.0f, 0.0f, 0.0f);
func_8028D638(0, 0);
baModel_80292048(1, 0.0f, 0.0f, 0.0f);
baModel_80292048(0, 0.0f, 0.0f, 0.0f);
baMarker_8028D638(0, 0);
func_8029E070(0);
gravity_reset();
}

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

@@ -35,7 +35,7 @@ void bsbshock_charge_init(void){
D_8037D382 = func_8030D90C();
sfxsource_setSfxId(D_8037D382, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D382, 1.4f, 0.4f, -1.2f);
playerModel_80292158(-50.0f);
baModel_80292158(-50.0f);
func_80298528(-50.0f);
D_8037D380 = 1;
D_8037D381 = 0;
@@ -103,7 +103,7 @@ void bsbshock_charge_update(void){
if(animctrl_isAt(aCtrl, 0.5551f)){
player_setYVelocity(180.0f);
playerModel_80292158(0.0f);
baModel_80292158(0.0f);
func_80298528(50.0f);
}
@@ -116,8 +116,8 @@ void bsbshock_charge_end(void){
func_8030DA44(D_8037D382);
func_8029E064(0);
func_8029E070(0);
if(playerModel_80292230() != 0.0f){
playerModel_80292158(0.0f);
if(baModel_80292230() != 0.0f){
baModel_80292158(0.0f);
func_80298528(50.0f);
}
}
@@ -146,7 +146,7 @@ void bsbshock_init(void){
func_8029E064(1);
func_8029E070(1);
ability_use(9);
playerModel_80292158(-50.0f);
baModel_80292158(-50.0f);
func_80298528(-50.0f);
D_8037D381 = 0;
}
@@ -190,6 +190,6 @@ void bsbshock_end(void){
func_8029E064(0);
func_8029E070(0);
playerModel_80292158(0.0f);
baModel_80292158(0.0f);
func_80298528(50.0f);
}

26
src/core2/bs/bSwim.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "core2/playerModel.h"
#include "core2/ba/model.h"
extern f32 func_8029494C(void);
extern f32 func_8029B2D0(void);
@@ -40,8 +40,8 @@ void func_802A71D8(void) {
func_80299234(250.0f, 20.0f);
} else {
roll_range = 35.0f;
yaw_range = func_80257C48(sp38, 3.1f, 2.4f);
func_80299234(90.0f, func_80257C48(sp38, 3.8f, 2.2f));
yaw_range = ml_interpolate_f(sp38, 3.1f, 2.4f);
func_80299234(90.0f, ml_interpolate_f(sp38, 3.8f, 2.2f));
}
roll_setIdeal(ml_map_f(sp30, -1.0f, 1.0f, -roll_range, roll_range));
yaw_setIdeal(mlNormalizeAngle(yaw_getIdeal() + ml_map_f(sp30, -1.0f, 1.0f, yaw_range, -yaw_range)));
@@ -50,7 +50,7 @@ void func_802A71D8(void) {
void func_802A7304() {
f32 temp_f0;
pitch_setAngVel(func_80257C48(func_802A716C(), 70.0f, 30.0f), 0.9f);
pitch_setAngVel(ml_interpolate_f(func_802A716C(), 70.0f, 30.0f), 0.9f);
temp_f0 = func_8029B2DC();
if (temp_f0 < 0.0f) {
pitch_setIdeal(ml_map_f(temp_f0, -1.0f, 0.0f, 275.0f, 360.0f));
@@ -77,7 +77,7 @@ void func_802A744C(void) {
func_8029B324(1, 1.0f);
func_8029E070(1);
func_80294378(3);
playerModel_setYDisplacement(60.0f);
baModel_setYDisplacement(60.0f);
func_80297B64(2.0f);
}
@@ -107,7 +107,7 @@ void func_802A75B0(void) {
func_8029B0C0();
func_8029E070(0);
func_80294378(1);
playerModel_setYDisplacement(0.0f);
baModel_setYDisplacement(0.0f);
}
}
@@ -189,7 +189,7 @@ void func_802A7838(void) {
func_802A7304();
if (D_8037D390 > 0.0f) {
func_802A77D8();
D_8037D390 = max_f(D_8037D390 - 10.0f, 0.0f);
D_8037D390 = ml_max_f(D_8037D390 - 10.0f, 0.0f);
}
if (animctrl_isAt(anim_ctrl, 0.1f)) {
func_8030EB88(SFX_0_BLOOP, 1.2f, 1.4f);
@@ -295,7 +295,7 @@ void func_802A7BD0(void) {
func_8029797C(sp3C);
func_802979AC(sp3C, func_80297A64());
func_8029C7F4(1, 1, 2, 3);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_802A744C();
}
@@ -323,7 +323,7 @@ void func_802A7CA8(void) {
void func_802A7D74(void) {
func_80297CA8();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802A75B0();
}
@@ -400,7 +400,7 @@ void func_802A7F6C(void) {
pitch_setIdeal(275.0f);
roll_setIdeal(0.0f);
D_8037D396 = 0;
func_8028D5DC();
baMarker_collisionOff();
func_8029E3C0(0, 0.0f);
func_8029E3C0(1, 0.0f);
func_802906A4(3);
@@ -463,7 +463,7 @@ void func_802A82D4(void) {
func_802906A4(1);
func_80291548();
func_8024BD08(0);
func_8028D5F4();
baMarker_collisionOn();
if (bs_getNextState() != BS_5A_LOADZONE) {
func_80346CE8();
}
@@ -517,7 +517,7 @@ void func_802A846C(void) {
func_8029CCC4();
sp28 = func_8029494C();
if (bs_getPrevState() == 0xF) {
sp28 = max_f(sp28, 600.0f);
sp28 = ml_max_f(sp28, 600.0f);
}
if (sp28 > 80.0f) {
animctrl_reset(temp_s0);
@@ -553,7 +553,7 @@ void func_802A85EC(void) {
particleEmitter_setParticleVelocityRange(sp34, -30.0f, -30.0f, -30.0f, 30.0f, 30.0f, 30.0f);
particleEmitter_emitN(sp34, 1);
if (D_8037D398 < 0.0f) {
D_8037D398 += max_f(mlAbsF(D_8037D398) * 0.1, 50.0f);
D_8037D398 += ml_max_f(mlAbsF(D_8037D398) * 0.1, 50.0f);
player_setYVelocity(D_8037D398);
}
if (func_8028B2E8()) {

16
src/core2/bs/bTrot.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "core2/playerModel.h"
#include "core2/ba/model.h"
/* .data */
f32 D_80364A90 = 30.0f;
@@ -91,7 +91,7 @@ void func_802A89D4(void){
func_80297970(0.0f);
}
else{
func_80297970(func_80257C48(sp24, func_802A8900(), func_802A88B0()));
func_80297970(ml_interpolate_f(sp24, func_802A8900(), func_802A88B0()));
}
}
@@ -105,7 +105,7 @@ void func_802A8A40(void){
roll_setAngularVelocity(1000.0f, 12.0f);
miscflag_set(3);
func_8029CF48(4,1,0.24f);
playerModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
}
void func_802A8AD8(void){
@@ -134,7 +134,7 @@ void func_802A8BB0(void){
if(bsbtrot_inSet(next_state))
return;
playerModel_setDirection(PLAYER_MODEL_DIR_BANJO);
baModel_setDirection(PLAYER_MODEL_DIR_BANJO);
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
@@ -523,7 +523,7 @@ void bsbtrot_slide_update(void){
if(func_80291698(3))
func_802A87C0();
func_80299AAC();
D_8037D3A0 = max_f(D_8037D3A0-time_getDelta(), 0.0f);
D_8037D3A0 = ml_max_f(D_8037D3A0-time_getDelta(), 0.0f);
if(player_shouldSlideTrot()){
func_80294480(sp30);
func_8025801C(sp30, &sp2C);
@@ -680,7 +680,7 @@ void bsbtrot_unk79_init(void){
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A8A40();
playerModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
func_8029C674();
}
@@ -721,7 +721,7 @@ void bsbtrot_ow_init(void){
func_802978DC(6);
player_setYVelocity(func_802987C4());
gravity_set(func_802987E4());
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
}
@@ -748,7 +748,7 @@ void bsbtrot_ow_update(void){
void bsbtrot_ow_end(void){
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802A8BB0();
}

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

@@ -19,7 +19,7 @@ void func_802AA400(void){
if(!func_8029B300()){
func_80297970(0.0f);
}else{
func_80297970(func_80257C48(sp1C, D_80364AD0, D_80364AD4));
func_80297970(ml_interpolate_f(sp1C, D_80364AD0, D_80364AD4));
}
}

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

@@ -119,7 +119,7 @@ void bsbbuster_update(void){
D_8037D2B4++;
}
if(D_8037D2B6 == 0 && func_8028B254(0x4b)){
func_80250D94(1.0f, 0.3f, 0.4f);
rumbleManager_80250D94(1.0f, 0.3f, 0.4f);
D_8037D2B6++;
}
D_8037D2B9 = miscflag_isTrue(8);

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

@@ -8,7 +8,7 @@ f32 func_8029B33C(void);
void func_8029797C(f32);
void func_80297970(f32);
void playerModel_setYDisplacement(f32);
void baModel_setYDisplacement(f32);
void func_80297BF8(f32);
void func_802BFE50(f32, f32, f32);
void func_80299234(f32, f32);
@@ -94,7 +94,7 @@ void func_802A0750(void){
void _bsbeefly_end(void){
if(bsBeeFly_inSet(bs_getNextState()))
return;
playerModel_setYDisplacement(0.0f);
baModel_setYDisplacement(0.0f);
roll_setIdeal(0.0f);
pitch_setIdeal(0.0f);
func_80291548();
@@ -107,7 +107,7 @@ void _bsbeefly_end(void){
void func_802A07F8(void){
if(bsBeeFly_inSet(bs_getPrevState()))
return;
playerModel_setYDisplacement(65.0f);
baModel_setYDisplacement(65.0f);
func_802991A8(3);
roll_setAngularVelocity(500.0f, 2.0f);
func_802A0724();

16
src/core2/bs/beeMain.c
View File

@@ -15,7 +15,7 @@ f32 func_80289F70(void);
void func_8028A3B8(f32, f32);
f32 func_8029B2E8(void);
f32 func_8029B33C(void);
f32 func_80257C48(f32, f32, f32);
f32 ml_interpolate_f(f32, f32, f32);
f32 func_8029B30C();
/* .data */
@@ -54,7 +54,7 @@ void func_802A1020(void){
func_80297970(0.0f);
}
else{
func_80297970(func_80257C48(sp1c, D_803649E0, D_803649E4));
func_80297970(ml_interpolate_f(sp1c, D_803649E0, D_803649E4));
}
}
@@ -331,7 +331,7 @@ void func_802A18E8(s32 arg0){
func_8029C7F4(1, 1, 2, 3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
D_8037D2D4 = 0;
}
@@ -364,7 +364,7 @@ void func_802A1A50(void){
void func_802A1B28(void){
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802A02C0();
}
@@ -422,7 +422,7 @@ void bsbeemain_die_init(void){
player_setYVelocity(420.0f);
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_802914CC(0xd);
func_802BF2C0(30.0f);
@@ -458,7 +458,7 @@ void func_802A1DD8(void){
break;
case 3:
if(0.0f < D_8037D2D0){
D_8037D2D0 = max_f(0.0f, D_8037D2D0 - 10.0f);
D_8037D2D0 = ml_max_f(0.0f, D_8037D2D0 - 10.0f);
}
break;
}//L802A1EFC
@@ -507,7 +507,7 @@ void func_802A2014(void){
}
void func_802A2054(void){
func_8028D5F4();
baMarker_collisionOn();
func_8025A2FC(-1, 0xFA0);
func_8024BD08(1);
func_80291548();
@@ -524,7 +524,7 @@ void func_802A2098(void){
func_8025A2FC(0, 0xFA0);
func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE, -1);
func_8029151C(0xC);
func_8028D5DC();
baMarker_collisionOff();
func_8029E3C0(0, 3.0f);
}

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

@@ -14,7 +14,7 @@ void func_802AAE80(void){
if(func_8029B300() == 0)
func_80297970(0.0f);
else
func_80297970(func_80257C48(sp1C, D_80364AF0, D_80364AF4));
func_80297970(ml_interpolate_f(sp1C, D_80364AF0, D_80364AF4));
}
void func_802AAEE0(void){
@@ -91,14 +91,14 @@ int bscarry_inSet(enum bs_e state){
void bscarry_interrupt(void){
switch(bs_getInterruptType()){
case 7:
func_802948F8(func_8028D688());
func_802948F8(baMarker_8028D688());
break;
case 8:
func_8029A86C(2);
bs_setState(BS_3C_TALK);
break;
case 0x12:
func_8028DE6C(carriedObject_getActorID());
func_8028DE6C(baMarker_getCarriedObjectActorId());
break;
case BS_INTR_16_THROW_CARRIED_OBJ:
if(func_802916CC(1)){

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

@@ -70,7 +70,7 @@ void func_802ABF54(void){
func_80297970(0.0f);
}
else{
func_80297970(func_80257C48(sp1C, D_80364B00, func_802ABDC0()));
func_80297970(ml_interpolate_f(sp1C, D_80364B00, func_802ABDC0()));
}
}
@@ -353,7 +353,7 @@ static void __bscroc_recoil_init(s32 damage){
func_8029C7F4(1,1,2,3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
D_8037D3EC = 0;
}
@@ -383,7 +383,7 @@ static void __bscroc_recoil_update(void){
void __bscroc_recoil_end(void){
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802ABFBC();
}
@@ -439,7 +439,7 @@ void bscroc_die_init(void){
player_setYVelocity(420.0f);
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_802914CC(0xd);
func_802BF2C0(30.0f);
@@ -477,7 +477,7 @@ void bscroc_die_update(void){
break;
case 3:
if(0.0f < D_8037D3E0)
D_8037D3E0 = max_f(0.0f, D_8037D3E0 - 10.0f);
D_8037D3E0 = ml_max_f(0.0f, D_8037D3E0 - 10.0f);
break;
}//L802ACECC
@@ -612,7 +612,7 @@ void func_802AD318(void){
void bscroc_eat_good_init(void){
func_8028A010(0x122, 0.25f);
func_8029C7F4(1,1,1,2);
playerModel_setPostDraw(func_802AD2A8);
baModel_setPostDraw(func_802AD2A8);
D_8037D3E8 = assetcache_get(func_80294974());
D_8037D3F0 = 1.0f;
D_8037D3F5 = 0;
@@ -628,7 +628,7 @@ void bscroc_eat_good_update(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
func_802ABE70();
D_8037D3F0 = max_f(0.1f, D_8037D3F0 - 0.05);
D_8037D3F0 = ml_max_f(0.1f, D_8037D3F0 - 0.05);
func_80299628(0);
func_802ABF54();
if(animctrl_isAt(aCtrl, 0.99f)){
@@ -661,7 +661,7 @@ void bscroc_eat_good_update(void){
void bscroc_eat_good_end(void){
D_8037D3F5 = 0;
assetcache_release(D_8037D3E8);
playerModel_setPostDraw(0);
baModel_setPostDraw(0);
func_802ABFBC();
}

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

@@ -56,7 +56,7 @@ void bsdie_init(void){
func_8029C984();
func_8029E3C0(0,2.9f);
D_8037D414 = 0;
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
}
@@ -73,7 +73,7 @@ void bsdie_update(void){
player_setYVelocity(400.0f);
func_80299DB8();
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.0f, 18000);
func_80250D94(1.0f, 1.0f, 0.4f);
rumbleManager_80250D94(1.0f, 1.0f, 0.4f);
_bsdie_802ADE20();
D_8037D414 = 1;
}
@@ -82,12 +82,12 @@ void bsdie_update(void){
if(_bsdie_802ADE00()){
func_80299E00();
FUNC_8030E624(SFX_38_BANJO_AYE_1, 1.0f, 18000);
func_80250D94(1.0f, 0.5f, 0.4f);
rumbleManager_80250D94(1.0f, 0.5f, 0.4f);
D_8037D414 = 2;
}
break;
case 2://L802AE184
D_8037D410 = max_f(D_8037D410 - 12.0f, 0.0f);
D_8037D410 = ml_max_f(D_8037D410 - 12.0f, 0.0f);
if(140.0f < D_8037D410)
func_802929F8();

24
src/core2/bs/droneenter.c
View File

@@ -30,8 +30,8 @@ void __bsDroneEnter_setSubstate(enum bsdroneenter_state_e arg0) {
func_8025A6CC(COMUSIC_43_ENTER_LEVEL_GLITTER, 32000);
func_8025AABC(COMUSIC_43_ENTER_LEVEL_GLITTER);
func_8029E3C0(0, 0.4f);
playerModel_setEnvAlpha(0);
playerModel_updateModel();
baModel_setEnvAlpha(0);
baModel_updateModel();
break;
case 3:
comusic_8025AB44(COMUSIC_43_ENTER_LEVEL_GLITTER, 0, 2000);
@@ -69,27 +69,27 @@ void __bsDroneEnter_emitParticles(void) {
}
void __bsDroneEnter_initParticleTypes(ParticleEmitter *p_ctrl, enum asset_e sprite_id) {
func_802F0D54(p_ctrl);
particleEmitter_manualFree(p_ctrl);
particleEmitter_setSprite(p_ctrl, sprite_id);
func_802EFA5C(p_ctrl, 0.3f, 0.8f);
particleEmitter_setFade(p_ctrl, 0.3f, 0.8f);
func_802EFB70(p_ctrl, 0.15f, 0.22f);
func_802EFB84(p_ctrl, 0.03f, 0.05f);
func_802EFE24(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
func_802EFEC0(p_ctrl, 0.55f, 0.55f);
particleEmitter_setAngularVelocityRange(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 0.55f, 0.55f);
}
void __bsDroneEnter_removeParticleTypes(void) {
partEmitList_remove(bsDroneEnter.yellow_sparkle_emitter);
partEmitList_remove(bsDroneEnter.white_sparkle_emitter);
partEmitMgr_freeEmitter(bsDroneEnter.yellow_sparkle_emitter);
partEmitMgr_freeEmitter(bsDroneEnter.white_sparkle_emitter);
}
void __bsDroneEnter_init(void) {
bsDroneEnter.unk10 = 0.0f;
bsDroneEnter.unk8 = 0.0f;
bsDroneEnter.unkC = 1.0f;
bsDroneEnter.white_sparkle_emitter = partEmitList_pushNew(60);
bsDroneEnter.white_sparkle_emitter = partEmitMgr_newEmitter(60);
__bsDroneEnter_initParticleTypes(bsDroneEnter.white_sparkle_emitter, ASSET_716_SPRITE_SPARKLE_WHITE);
bsDroneEnter.yellow_sparkle_emitter = partEmitList_pushNew(60);
bsDroneEnter.yellow_sparkle_emitter = partEmitMgr_newEmitter(60);
__bsDroneEnter_initParticleTypes(bsDroneEnter.yellow_sparkle_emitter, ASSET_713_SPRITE_SPARKLE_YELLOW);
}
@@ -131,7 +131,7 @@ void bsDroneEnter_update(void) {
case BSDRONEENTER_SUBSTATE_2:
func_802AE914();
sp20 = func_8029E1A8(0);
playerModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 255.0f, 0.0f));
baModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 255.0f, 0.0f));
if (sp20) {
__bsDroneEnter_setSubstate(BSDRONEENTER_SUBSTATE_3);
}
@@ -148,5 +148,5 @@ void bsDroneEnter_update(void) {
void bsDroneEnter_end(void){
__bsDroneEnter_removeParticleTypes();
func_80294378(1);
playerModel_updateModel();
baModel_updateModel();
}

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

@@ -46,7 +46,7 @@ void bsDroneLook_update(void) {
eye_rotation[0] -= func_8029B2DC() * 90.0f * dt;
eye_rotation[1] -= func_8029B2D0() * 90.0f * dt;
eye_rotation[2] = 0.0f;
eye_rotation[0] = (eye_rotation[0] > 180.0f) ? max_f(305.0f, eye_rotation[0]) : min_f(70.0f, eye_rotation[0]);
eye_rotation[0] = (eye_rotation[0] > 180.0f) ? ml_max_f(305.0f, eye_rotation[0]) : ml_min_f(70.0f, eye_rotation[0]);
func_802C2A8C(eye_rotation);
yaw_setIdeal(eye_rotation[1] + 180.0f);
exit_first_person = FALSE;

22
src/core2/bs/dronevanish.c
View File

@@ -25,7 +25,7 @@ void __bsDroneVanish_setSubstate(s32 next_state) {
break;
case 3:
gcpausemenu_returnToLair();
playerModel_setVisible(FALSE);
baModel_setVisible(FALSE);
comusic_8025AB44(COMUSIC_43_ENTER_LEVEL_GLITTER, 0, 2000);
func_8029E3C0(0, 2.0f);
break;
@@ -53,28 +53,28 @@ void __bsDroneVanish_emitParticles(void) {
}
void __bsDroneVanish_particleEmitInit(ParticleEmitter *p_ctrl, enum asset_e sprite_id) {
func_802F0D54();
particleEmitter_manualFree();
particleEmitter_setSprite(p_ctrl, sprite_id);
func_802EFA5C(p_ctrl, 0.3f, 0.8f);
particleEmitter_setFade(p_ctrl, 0.3f, 0.8f);
particleEmitter_setParticleSpawnPositionRange(p_ctrl, -45.0f, 0.0f, -45.0f, 45.0f, 0.0f, 45.0f);
func_802EFB70(p_ctrl, 0.15f, 0.22f);
func_802EFB84(p_ctrl, 0.03f, 0.05f);
func_802EFE24(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
func_802EFEC0(p_ctrl, 0.55f, 0.55f);
particleEmitter_setAngularVelocityRange(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 0.55f, 0.55f);
}
void __bsDroneVanish_end(void) {
partEmitList_remove(D_8037D450.unk4);
partEmitList_remove(D_8037D450.unk0);
partEmitMgr_freeEmitter(D_8037D450.unk4);
partEmitMgr_freeEmitter(D_8037D450.unk0);
}
void __bsDroneVanish_init(void) {
D_8037D450.unk10 = 0.0f;
D_8037D450.unk8 = 0.0f;
D_8037D450.unkC = 1.0f;
D_8037D450.unk0 = partEmitList_pushNew(60);
D_8037D450.unk0 = partEmitMgr_newEmitter(60);
__bsDroneVanish_particleEmitInit(D_8037D450.unk0, ASSET_716_SPRITE_SPARKLE_WHITE);
D_8037D450.unk4 = partEmitList_pushNew(60);
D_8037D450.unk4 = partEmitMgr_newEmitter(60);
__bsDroneVanish_particleEmitInit(D_8037D450.unk4, ASSET_713_SPRITE_SPARKLE_YELLOW);
}
@@ -115,7 +115,7 @@ void bsDroneVanish_update(void) {
case 2:
__bsDroneVanish_update();
sp20 = func_8029E1A8(0);
playerModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 0.0f, 255.0f));
baModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 0.0f, 255.0f));
if (sp20) {
__bsDroneVanish_setSubstate(3);
}
@@ -132,5 +132,5 @@ void bsDroneVanish_update(void) {
void bsDroneVanish_end(void){
__bsDroneVanish_end();
func_80294378(1);
playerModel_updateModel();
baModel_updateModel();
}

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

@@ -7,7 +7,7 @@ extern void yaw_applyIdeal(void);
extern void func_802978DC(int);
extern f32 func_80257A44(f32, f32);
extern f32 cosf(f32);
extern f32 func_802588B0(f32, f32);
extern f32 ml_remainder_f(f32, f32);
extern f32 func_80257AD4(f32, f32);
/* .bss */
@@ -25,20 +25,20 @@ struct {
f32 unk24;
f32 unk28;
f32 unk2C;
u8 unk30;
u8 unk31; //enum bs_e
u8 unk32;
u8 room_transformation;
u8 player_transformation; //enum bs_e
u8 state;
} D_8037D470;
/* .code */
void func_802AF7A0(ParticleEmitter *arg0, enum asset_e arg1){
func_802F0D54(arg0);
particleEmitter_manualFree(arg0);
particleEmitter_setSprite(arg0, arg1);
particleEmitter_setParticleAccelerationRange(arg0, 0.0f, -50.0f, 0.0f, 0.0f, -50.0f, 0.0f);
func_802EFA5C(arg0, 0.4f, 0.8f);
particleEmitter_setFade(arg0, 0.4f, 0.8f);
func_802EFB84(arg0, 0.03f, 0.03f);
func_802EFE24(arg0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
func_802EFEC0(arg0, 0.65f, 0.65f);
particleEmitter_setAngularVelocityRange(arg0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(arg0, 0.65f, 0.65f);
func_802EFF50(arg0, 1.0f);
}
@@ -65,16 +65,16 @@ void func_802AF900(void){
sp40 = sinf(sp4C);
sp44 = cosf(sp4C);
sp30[0] += sp40 * D_8037D470.unk18;
sp30[1] += func_80257C48(func_80257A44(sp3C, 1.14f), 0.0f, 130.0f);
sp30[1] += ml_interpolate_f(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_emitN(D_8037D470.unk4, 1);
player_getPosition(sp30);
sp4C = (1.0 - func_802588B0(sp48 + 0.5, 1.0f))* 6.283185308;
sp4C = (1.0 - ml_remainder_f(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[1] += ml_interpolate_f(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);
@@ -82,15 +82,15 @@ void func_802AF900(void){
}
void func_802AFADC(void){
partEmitList_remove(D_8037D470.unk4);
partEmitList_remove(D_8037D470.unk0);
partEmitMgr_freeEmitter(D_8037D470.unk4);
partEmitMgr_freeEmitter(D_8037D470.unk0);
}
void func_802AFB0C(void){
D_8037D470.unk0 = partEmitList_pushNew(0x32);
D_8037D470.unk0 = partEmitMgr_newEmitter(0x32);
func_802AF7A0(D_8037D470.unk0, ASSET_476_SPRITE_BLUE_GLOW); //blue glow
D_8037D470.unk4 = partEmitList_pushNew(0x32);
D_8037D470.unk4 = partEmitMgr_newEmitter(0x32);
func_802AF7A0(D_8037D470.unk4, ASSET_477_SPRITE_YELLOW_GLOW); //orange glow
D_8037D470.unkC = 1.0f;
@@ -142,34 +142,34 @@ void func_802AFBB8(f32 arg0[3]){
{{-200.0f, 10.0f, -200.0f}, { 200.0f, 20.0f, 200.0f}},
{{ 0.0f, -850.0f, 0.0f}, { 0.0f, -850.0f, 0.0f}}
};
ParticleEmitter* s0 = partEmitList_pushNew(1);
ParticleEmitter* s0 = partEmitMgr_newEmitter(1);
particleEmitter_setSprite(s0, ASSET_6C4_SPRITE_SMOKE_YELLOW); //yellow blast
func_802EFA5C(s0, 0.7f, 0.8f);
particleEmitter_setFade(s0, 0.7f, 0.8f);
particleEmitter_setParticleFramerateRange(s0, 12.0f, 12.0f);
particleEmitter_setPosition(s0, arg0);
func_802EFB70(s0, 3.2f, 3.2f);
func_802EFB84(s0, 3.2f, 3.2f);
func_802EFEC0(s0, 0.8f, 0.8f);
particleEmitter_setParticleLifeTimeRange(s0, 0.8f, 0.8f);
particleEmitter_emitN(s0, 1);
s0 = partEmitList_pushNew(1);
s0 = partEmitMgr_newEmitter(1);
particleEmitter_setSprite(s0, ASSET_6C2_SPRITE_SMOKE_WHITE); //smoke
func_802EFA5C(s0, 0.1f, 0.8f);
particleEmitter_setFade(s0, 0.1f, 0.8f);
particleEmitter_setParticleFramerateRange(s0, 15.0f, 15.0f);
particleEmitter_setPosition(s0, arg0);
func_802EFB70(s0, 3.0f, 3.0f);
func_802EFB84(s0, 3.0f, 3.0f);
func_802EFEC0(s0, 0.65f, 0.65f);
particleEmitter_setParticleLifeTimeRange(s0, 0.65f, 0.65f);
particleEmitter_emitN(s0, 1);
s0 = partEmitList_pushNew(0x11);
s0 = partEmitMgr_newEmitter(0x11);
particleEmitter_setSprite(s0, ASSET_713_SPRITE_SPARKLE_YELLOW); //sparkle
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364BB0);
func_802EFA5C(s0, 0.0f, 0.6f);
particleEmitter_setFade(s0, 0.0f, 0.6f);
func_802EFB70(s0, 0.28f, 0.32f);
func_802EFB84(s0, 0.03f, 0.03f);
func_802EFE24(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
func_802EFEC0(s0, 2.0f, 2.0f);
particleEmitter_setAngularVelocityRange(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(s0, 2.0f, 2.0f);
func_802EFF50(s0, 1.0f);
particleEmitter_setPosition(s0, arg0);
particleEmitter_emitN(s0, 8);
@@ -182,14 +182,14 @@ void func_802AFBB8(f32 arg0[3]){
func_802EFA18(s0, 3);
particleEmitter_emitN(s0, 4);
s0 = partEmitList_pushNew(0x11);
s0 = partEmitMgr_newEmitter(0x11);
particleEmitter_setSprite(s0, ASSET_716_SPRITE_SPARKLE_WHITE); //sparkle
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364C40);
func_802EFA5C(s0, 0.0f, 0.6f);
particleEmitter_setFade(s0, 0.0f, 0.6f);
func_802EFB70(s0, 0.28f, 0.32f);
func_802EFB84(s0, 0.03f, 0.03f);
func_802EFE24(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
func_802EFEC0(s0, 2.0f, 2.0f);
particleEmitter_setAngularVelocityRange(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(s0, 2.0f, 2.0f);
func_802EFF50(s0, 1.0f);
particleEmitter_setPosition(s0, arg0);
particleEmitter_emitN(s0, 8);
@@ -246,13 +246,13 @@ void func_802B01C8(void){
D_8037D470.unk20 += time_getDelta();
}
static void __bsdronexform_setState(int arg0){
static void __bsdronexform_setState(int next_state){
enum asset_e sp34;
f32 sp30;
f32 sp24[3];
D_8037D470.unk32 = arg0;
switch(arg0){
D_8037D470.state = next_state;
switch(next_state){
case 1:// 802B0230
D_8037D470.unk1C = 1;
D_8037D470.unk2C = player_getYPosition();
@@ -289,12 +289,12 @@ static void __bsdronexform_setState(int arg0){
case 6: // 802B033C
func_802BB3DC(2, 80.0f, 0.85f);
func_8030E6D4(SFX_147_GRUNTY_SPELL_ATTACK_2);
if(D_8037D470.unk30 == 7 || D_8037D470.unk31 == 7){
if(D_8037D470.room_transformation == TRANSFORM_7_WISHWASHY || D_8037D470.player_transformation == TRANSFORM_7_WISHWASHY){
yaw_setIdeal(yaw_get() + 180.0f);
yaw_applyIdeal();
}
func_8029A95C(func_80294A4C()); //set player transformation
playerModel_updateModel(); //update player model
player_setTransformation(func_80294A4C()); //set player transformation
baModel_updateModel(); //update player model
func_8029BD44(&sp34, &sp30);
func_8028A010(sp34, sp30);
func_8029E3C0(0, 0.1f);
@@ -305,7 +305,7 @@ static void __bsdronexform_setState(int arg0){
break;
case 8: // 802B03FC
if(D_8037D470.unk30 == 1 && D_8037D470.unk31 == 1){
if(D_8037D470.room_transformation == TRANSFORM_1_BANJO && D_8037D470.player_transformation == TRANSFORM_1_BANJO){
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
}
func_8029E3C0(0, 1.0f);
@@ -332,10 +332,10 @@ void bsdronexform_init(void){
func_80294378(6);
func_802AFB0C();
func_802B016C();
D_8037D470.unk31 = _player_getTransformation();
D_8037D470.unk30 = func_80294A4C();
D_8037D470.player_transformation = _player_getTransformation();
D_8037D470.room_transformation = func_80294A4C();
miscflag_set(MISC_FLAG_1B_TRANSFORMING);
D_8037D470.unk32 = 0;
D_8037D470.state = 0;
__bsdronexform_setState(1);
}
@@ -349,7 +349,7 @@ void bsdronexform_update(void){
func_802AFFAC();
func_802B01C8();
switch(D_8037D470.unk32){
switch(D_8037D470.state){
case 1:
sp24 = func_8029E1A8(0);
player_setYPosition(func_802B051C(0, 2.8f, 0.0f, 90.0f) + D_8037D470.unk2C);

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

@@ -42,7 +42,7 @@ void bsjig_jiggy_init(void){
func_8030E6D4(SFX_33_BANJO_AHOO);
miscflag_clear(7);
miscflag_clear(0xf);
func_8028D5DC();
baMarker_collisionOff();
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 1);
D_8037D4B0 = 0;
}
@@ -106,7 +106,7 @@ void bsjig_jiggy_end(void){
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
}
func_8028D5F4();
baMarker_collisionOn();
if( jiggyscore_total() == 100
&& func_8031FF1C(BKPROG_FC_DEFEAT_GRUNTY)
&& bs_getNextState() != BS_34_JIG_NOTEDOOR
@@ -144,7 +144,7 @@ void bsjig_jiggy_interrupt(void){
}
void bsjig_notedoor_end(void){
func_8028D5F4();
baMarker_collisionOn();
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
func_8029E070(0);
@@ -179,7 +179,7 @@ void bsjig_notedoor_init(void){
func_8029151C(0xc);
func_8029E070(1);
func_8030E6D4(SFX_33_BANJO_AHOO);
func_8028D5DC();
baMarker_collisionOff();
}
void bsjig_notedoor_update(void){

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

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "core2/playerModel.h"
#include "core2/ba/model.h"
f32 func_80294438(void);
void func_8029797C(f32);
@@ -348,7 +348,7 @@ void func_802B1BF4(void) {
func_80297970(0.0f);
func_80297A0C(0);
D_8037D4C0 = 0;
func_8028D5DC();
baMarker_collisionOff();
}
void func_802B1CF8(void) {
@@ -378,7 +378,7 @@ void func_802B1CF8(void) {
}
void func_802B1DA4(void){
func_8028D5F4();
baMarker_collisionOn();
}
bool bsjump_jumpingFromWater(void){
@@ -388,7 +388,7 @@ bool bsjump_jumpingFromWater(void){
void bsjump_tumble_init(void){
func_8028A084(0x68, 0.35f);
func_8029C7F4(1,1,3,6);
playerModel_setYDisplacement(60.0f);
baModel_setYDisplacement(60.0f);
if(func_80293234() == 1){
func_8029E3C0(0, 0.5f);
func_8029E3C0(1, 0.41f);
@@ -439,6 +439,6 @@ void bsjump_tumble_end(void){
func_80293240(3);
}
func_8029CB84();
playerModel_setYDisplacement(0.0f);
baModel_setYDisplacement(0.0f);
func_80299E6C();
}

4
src/core2/bs/ow.c
View File

@@ -22,7 +22,7 @@ void bsow_init(void){
func_802875AC(plyr_mvmnt, "bsow.c", 0x50);
func_80299BFC(1.0f);
func_802B360C();
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
D_8037D4D0 = 0;
func_802B1FD0(1);
@@ -66,6 +66,6 @@ void bsow_end(void){
func_802B1FD0(0);
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
}

20
src/core2/bs/pumpkin.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "core2/playerModel.h"
#include "core2/ba/model.h"
extern void func_8028A084(s32, f32);
extern void func_8029AD68(f32, s32);
@@ -45,7 +45,7 @@ void func_802B223C(void) {
func_80297970(0.0f);
return;
}
func_80297970(func_80257C48(sp1C, D_80364CF0, D_80364CF4));
func_80297970(ml_interpolate_f(sp1C, D_80364CF0, D_80364CF4));
}
void func_802B229C(void) {
@@ -322,7 +322,7 @@ void func_802B2C58(void) {
sp3C = ml_map_f(sp34, 0.0f, 2.3f, 0.0f, 45.0f);
yaw_setIdeal(mlNormalizeAngle(sp38 + sp3C));
yaw_applyIdeal();
playerModel_setScale(ml_map_f(sp34, 0.0f, 2.3f, 1.0f, 0.3f));
baModel_setScale(ml_map_f(sp34, 0.0f, 2.3f, 1.0f, 0.3f));
ml_vec3f_copy(sp28, D_8037D4E8);
sp28[1] = ml_map_f(sp34, 0.0f, 2.3f, D_8037D4E8[1], D_8037D4E8[1] - 50.0);
func_8028FAB0(sp28);
@@ -330,7 +330,7 @@ void func_802B2C58(void) {
void func_802B2D50(void) {
func_80294378(1);
playerModel_setScale(1.0f);
baModel_setScale(1.0f);
}
void func_802B2D80(s32 arg0) {
@@ -362,7 +362,7 @@ void func_802B2D80(s32 arg0) {
func_8029C7F4(1, 1, 2, 3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
D_8037D4E0 = 0;
}
@@ -394,7 +394,7 @@ void func_802B2EE8(void) {
void func_802B2F9C(void) {
func_80297CA8();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802B229C();
}
@@ -455,7 +455,7 @@ void func_802B309C(void) {
func_802914CC(0xD);
func_802BF2C0(30.0f);
func_8029C984();
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_8029E3C0(1, 2.9f);
D_8037D4E0 = 0;
@@ -491,7 +491,7 @@ void func_802B3240(void){
break;
case 3://L802B3338
D_8037D4F4 = max_f(0.0f, D_8037D4F4 - 10.0f);
D_8037D4F4 = ml_max_f(0.0f, D_8037D4F4 - 10.0f);
if (func_8028B254(90)) {
func_8028A37C(0.36f);
D_8037D4E0 = 4;
@@ -499,7 +499,7 @@ void func_802B3240(void){
break;
case 4://L802B3384
D_8037D4F4 = max_f(0.0f, D_8037D4F4 - 10.0f);
D_8037D4F4 = ml_max_f(0.0f, D_8037D4F4 - 10.0f);
if (func_8028B2E8()) {
func_8029AE48();
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
@@ -510,7 +510,7 @@ void func_802B3240(void){
break;
case 5://L802B33F4
D_8037D4F4 = max_f(0.0f, D_8037D4F4 - 10.0f);
D_8037D4F4 = ml_max_f(0.0f, D_8037D4F4 - 10.0f);
break;
}

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

@@ -103,7 +103,7 @@ void func_802B3868(void) {
_func_802875AC(anim_ctrl, "bsrebound.c", 0xC6);
func_8030E58C(SFX_56_BANJO_HUI, 1.0f);
func_8029E3C0(0, 1.5f);
func_8028D5DC();
baMarker_collisionOff();
}
@@ -114,7 +114,7 @@ void func_802B3954(void) {
next_state = 0;
anim_ctrl = _player_getAnimCtrlPtr();
if (func_8029E1A8(0) && map_get() == MAP_93_GL_DINGPOT) {
func_8028D5F4();
baMarker_collisionOn();
}
func_802B37DC();
if (func_8028B2E8()) {
@@ -133,5 +133,5 @@ void func_802B3954(void) {
void func_802B3A20(void) {
func_802B35DC();
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
}

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

@@ -84,7 +84,7 @@ void bsslide_update(void){
f32 sp28;
func_80299AAC();
D_8037D528 = max_f(D_8037D528 - time_getDelta(), 0.0f);
D_8037D528 = ml_max_f(D_8037D528 - time_getDelta(), 0.0f);
if(player_isSliding()){
func_80294480(sp30);
if(func_80258108(sp30, &sp2C, &sp28)){

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

@@ -4,7 +4,7 @@
#include "bsint.h"
void func_80292900(f32, f32);
void func_80250D94(f32, f32, f32);
void rumbleManager_80250D94(f32, f32, f32);
/* .bss */
u8 D_8037D530;
@@ -27,10 +27,10 @@ void bssplat_init(void){
if(func_8029CEB0() == 4){
FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.8f, 32000);
func_80250D94(0.75f, 0.25f, 0.3f);
rumbleManager_80250D94(0.75f, 0.25f, 0.3f);
}else{
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
func_80250D94(1.0f, 0.5f, 0.4f);
rumbleManager_80250D94(1.0f, 0.5f, 0.4f);
}
func_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 28000);
func_802B4570();
@@ -39,13 +39,13 @@ void bssplat_init(void){
bs_setState(BS_41_DIE);
D_8037D530 = 0;
func_8028D5DC();
baMarker_collisionOff();
}
void bssplat_update(void){
enum bs_e sp1C = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
func_80297970(max_f(0.0f, func_80297A64() - 15.0f));
func_80297970(ml_max_f(0.0f, func_80297A64() - 15.0f));
switch (D_8037D530)
{
@@ -82,6 +82,6 @@ void bssplat_update(void){
}
void bssplat_end(void){
func_8028D5F4();
baMarker_collisionOn();
func_80297CA8();
}

16
src/core2/bs/stand.c
View File

@@ -9,7 +9,7 @@ void func_80299234(f32, f32);
void func_802875AC(AnimCtrl *, char*, s32);
void func_802900B4(void);
void func_80250D94(f32, f32, f32);
void rumbleManager_80250D94(f32, f32, f32);
/* .data */
u8 D_80364D20[] = {
@@ -100,7 +100,7 @@ void bsstand_init(void){
void func_802B4A10(AnimCtrl *arg0){
if(animctrl_isAt(arg0, 0.2057f)){ //(30/145)
FUNC_8030E624(SFX_21_EGG_BOUNCE_1, 1.8f, 16000);
func_80250D94(0.5f, 0.25f, 0.4f);
rumbleManager_80250D94(0.5f, 0.25f, 0.4f);
}//L802B4A54
if(animctrl_isAt(arg0, 0.2057f)) //(30/145)
@@ -109,12 +109,12 @@ void func_802B4A10(AnimCtrl *arg0){
if(animctrl_isAt(arg0, 0.2555f)){ //(37/145)
FUNC_8030E624(SFX_21_EGG_BOUNCE_1, 1.8f, 16000);
func_80250D94(0.5f, 0.25f, 0.4f);
rumbleManager_80250D94(0.5f, 0.25f, 0.4f);
}//L802B4AB0
if(animctrl_isAt(arg0, 0.2896f)){ //(42/145)
FUNC_8030E624(SFX_21_EGG_BOUNCE_1, 1.8f, 16000);
func_80250D94(0.5f, 0.25f, 0.4f);
rumbleManager_80250D94(0.5f, 0.25f, 0.4f);
}//L802B4AEC
if(animctrl_isAt(arg0, 0.3f)){ //(43.5/145)?
@@ -143,7 +143,7 @@ void func_802B4A10(AnimCtrl *arg0){
if(animctrl_isAt(arg0, 0.6619f)){
FUNC_8030E624(SFX_21_EGG_BOUNCE_1, 1.8f, 16000);
func_80250D94(0.5f, 0.25f, 0.4f);
rumbleManager_80250D94(0.5f, 0.25f, 0.4f);
}//L802B4BF4
if(animctrl_isAt(arg0, 0.6688f))
@@ -152,7 +152,7 @@ void func_802B4A10(AnimCtrl *arg0){
if(animctrl_isAt(arg0, 0.6964f)){
FUNC_8030E624(SFX_21_EGG_BOUNCE_1, 1.8f, 16000);
func_80250D94(0.5f, 0.25f, 0.4f);
rumbleManager_80250D94(0.5f, 0.25f, 0.4f);
}//L802B4C50
if(animctrl_isAt(arg0, 0.7747f))
@@ -315,14 +315,14 @@ void func_802B5350(void){
if(_player_getTransformation() != TRANSFORM_1_BANJO)
func_8029A86C(1);
else{
func_802948F8(func_8028D688());
func_802948F8(baMarker_8028D688());
bs_setState(BS_3A_CARRY_IDLE);
}
}
else if(sp1C == 0x12){//L802B53D0
func_8029A86C(1);
if( _player_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && func_802916CC(0)){
func_8028DE6C(carriedObject_getActorID());
func_8028DE6C(baMarker_getCarriedObjectActorId());
func_8029A86C(2);
}
}

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

@@ -34,9 +34,9 @@ void func_802B5480(void) {
if (func_80294574()) {
if (randf() > 0.5) {
playerModel_8029223C(bubble_spawn_position);
baModel_8029223C(bubble_spawn_position);
} else {
playerModel_80292260(bubble_spawn_position);
baModel_80292260(bubble_spawn_position);
}
bubble_emitter = func_8029B950(bubble_spawn_position, 0.0f);
particleEmitter_setParticleVelocityRange(bubble_emitter, -60.0f, -100.0f, -60.0f, 60.0f, 0.0f, 60.0f);
@@ -67,7 +67,7 @@ void func_802B55DC(void) {
func_80297970(0.0f);
return;
}
func_80297970(func_80257C48(sp1C, D_80364D40, D_80364D44));
func_80297970(ml_interpolate_f(sp1C, D_80364D40, D_80364D44));
}
void func_802B563C(void) {

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

@@ -64,7 +64,7 @@ void bsthrow_end(void){
void bsthrow_interrupt(void){
if(bs_getInterruptType() == BS_INTR_12){
if(D_8037D580 == 0){
func_8028DE6C(carriedObject_getActorID());
func_8028DE6C(baMarker_getCarriedObjectActorId());
}
else{
func_8029A86C(1);

4
src/core2/bs/timeout.c
View File

@@ -18,7 +18,7 @@ void func_802B6270(void){
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
func_8029E070(1);
func_8028D5DC();
baMarker_collisionOff();
}
void func_802B6314(void){
@@ -58,7 +58,7 @@ void func_802B63F8(void){
func_8025A58C(0,0xfa0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
func_8028D5DC();
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
}

14
src/core2/bs/walk.c
View File

@@ -12,7 +12,7 @@ void func_8029AD28(f32, s32);
f32 func_80297AF0(void);
void func_80289EF8(f32);
f32 func_8029B30C(void);
f32 func_80257C48(f32, f32, f32);
f32 ml_interpolate_f(f32, f32, f32);
f32 func_80297A64(void);
void func_80299594(s32, f32);
@@ -50,7 +50,7 @@ void func_802B6D00(void){
if(sp18 == 0){
func_80297970(0.0f);
}else{//L802B6D48
func_80297970(func_80257C48(func_8029B2E8(), D_80364D84, D_80364D88));
func_80297970(ml_interpolate_f(func_8029B2E8(), D_80364D84, D_80364D88));
}
}
else{//L802B6D78
@@ -59,16 +59,16 @@ void func_802B6D00(void){
func_80297970(0.0f);
break;
case 1://802B6DAC
func_80297970(func_80257C48(sp1C, D_80364D70, D_80364D74));
func_80297970(ml_interpolate_f(sp1C, D_80364D70, D_80364D74));
break;
case 2://802B6DD0
func_80297970(func_80257C48(sp1C, D_80364D74, D_80364D78));
func_80297970(ml_interpolate_f(sp1C, D_80364D74, D_80364D78));
break;
case 3://802B6DF4
func_80297970(func_80257C48(sp1C, D_80364D78, D_80364D7C));
func_80297970(ml_interpolate_f(sp1C, D_80364D78, D_80364D7C));
break;
case 4://802B6E18
func_80297970(func_80257C48(sp1C, D_80364D7C, D_80364D80));
func_80297970(ml_interpolate_f(sp1C, D_80364D7C, D_80364D80));
break;
}
}//L802B6E34
@@ -88,7 +88,7 @@ void func_802B6EB0(f32 arg0){
}
void func_802B6EBC(void){
D_8037D5B0 = max_f(0.0f, D_8037D5B0 - time_getDelta());
D_8037D5B0 = ml_max_f(0.0f, D_8037D5B0 - time_getDelta());
}
int func_802B6EF4(void){

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

@@ -3,7 +3,7 @@
#include "variables.h"
extern void func_8029AD68(f32, s32);
extern f32 ml_vec3f_dot_product(f32[3], f32[3]);
extern f32 ml_dotProduct_vec3f(f32[3], f32[3]);
int bswalrus_inSet(enum bs_e state);
@@ -47,7 +47,7 @@ void func_802B7E6C(void) {
func_80297970(0.0f);
return;
}
func_80297970(func_80257C48(sp1C, D_80364DC0, D_80364DC4));
func_80297970(ml_interpolate_f(sp1C, D_80364DC0, D_80364DC4));
}
void func_802B7ECC(void) {
@@ -55,7 +55,7 @@ void func_802B7ECC(void) {
if (func_80295530(8) < 3) {
D_8037D5C0 = 1.0f;
}
D_8037D5C0 = mlClamp_f(D_8037D5C0, 0.0f, 1.0f);
D_8037D5C0 = ml_clamp_f(D_8037D5C0, 0.0f, 1.0f);
}
void func_802B7F28(void) {
@@ -75,7 +75,7 @@ void func_802B7F28(void) {
if (900.0 < sp20[0] * sp20[0] + sp20[1] * sp20[1] + sp20[2] * sp20[2]) {
ml_vec3f_normalize(sp20);
func_80294480(sp2C);
if ( ml_vec3f_dot_product(sp20, sp2C) < -0.2) {
if ( ml_dotProduct_vec3f(sp20, sp2C) < -0.2) {
sp3C += D_8037D5C0 * 350.0;
}
}
@@ -83,7 +83,7 @@ void func_802B7F28(void) {
func_80297970(0.0f);
return;
}
func_80297970(func_80257C48(sp40, sp38, sp3C));
func_80297970(ml_interpolate_f(sp40, sp38, sp3C));
}
void func_802B8048(void){
@@ -387,7 +387,7 @@ static void __bswalrus_recoil_init(s32 damage){
func_8029C7F4(1,1,2,3);
player_setYVelocity(func_802987C4());
gravity_set(func_802987E4());
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_802B8110();
}
@@ -405,7 +405,7 @@ static void __bswalrus_recoil_update(void){
static void __bswalrus_recoil_end(void){
gravity_reset();
func_8028D5F4();
baMarker_collisionOn();
func_80292EA4();
func_802B8048();
}
@@ -467,7 +467,7 @@ void bswalrus_die_init(void){
func_8025AB00();
func_8025A2FC(0, 0xfa0);
func_8025A70C(0x1A);
func_8028D5DC();
baMarker_collisionOff();
func_80292E48();
func_8029E3C0(0, 1.5f);
func_802B8110();
@@ -494,7 +494,7 @@ void bswalrus_die_update(void){
break;
case 3://L802B8FB0
if(0.0f < D_8037D5C4){
D_8037D5C4 = max_f(0.0f, D_8037D5C4 - 10.0f);
D_8037D5C4 = ml_max_f(0.0f, D_8037D5C4 - 10.0f);
}
break;
}//L802B8FE0
@@ -567,9 +567,9 @@ void bswalrus_sled_update(void){
if(50.0f < func_80297AB8()){
if(func_8023DB4C(1)){
playerModel_80292554(&sp20);
baModel_80292554(&sp20);
}else{
playerModel_80292578(&sp20);
baModel_80292578(&sp20);
}
particleEmitter_emitN(func_802F1EC8(sp20), 1);
}//L802B927C
@@ -731,7 +731,7 @@ void func_802B978C(void) {
func_8025A58C(0, 0xFA0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
func_8028D5DC();
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
func_802B813C();
func_80292E48();