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

document various assets, bsStoredState.c, and stateTimers.c

Browse Source
This commit is contained in:
Banjo Kazooie
2023-02-16 13:21:40 -06:00
parent dd74091cb7
commit 1c4d1b54cd
107 changed files with 1649 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ void bsant_jump_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
func_8029E554();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSTERMITE_JUMP);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSANT_JUMP);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setTransitionDuration(aCtrl, 0.1f);
func_8028774C(aCtrl, 0.2987f);
@@ -233,7 +233,7 @@ void bsant_fall_init(void){
func_8029E554();
D_8037D298 = 0;
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSTERMITE_JUMP);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSANT_JUMP);
animctrl_setDuration(aCtrl, 1.9f);
func_8028774C(aCtrl, 0.4423f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
@@ -284,7 +284,7 @@ static void __bsant_recoil_init(int take_damage){
func_8029E554();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ASSET_28_ANIM_BSTERMITE_OW);
animctrl_setIndex(aCtrl, ASSET_28_ANIM_BSANT_OW);
animctrl_setDuration(aCtrl, 1.4f);
animctrl_setSubRange(aCtrl, 0.0f, 0.4899f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -374,7 +374,7 @@ void bsant_die_init(void){
func_8029B930();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ASSET_29_ANIM_BSTERMITE_DIE);
animctrl_setIndex(aCtrl, ASSET_29_ANIM_BSANT_DIE);
animctrl_setSubRange(aCtrl, 0.0f, 0.523f);
animctrl_setDuration(aCtrl, 1.6f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -67,7 +67,7 @@ void bsbarge_init(void){
plyrMvmnt = _player_getAnimCtrlPtr();
animctrl_reset(plyrMvmnt);
animctrl_setSmoothTransition(plyrMvmnt, 0);
animctrl_setIndex(plyrMvmnt, ANIM_BANJO_BBARGE);
animctrl_setIndex(plyrMvmnt, ASSET_1C_ANIM_BSBBARGE);
animctrl_setDuration(plyrMvmnt, 1.0f);
animctrl_setSubRange(plyrMvmnt, 0, 0.375f);
animctrl_setPlaybackType(plyrMvmnt, ANIMCTRL_ONCE);

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

@@ -18,7 +18,7 @@ f32 D_8037D308;
u8 D_8037D30C;
void bsbflap_init(void) {
func_8028A274(0x18, 0.3f);
func_8028A274(ASSET_18_ANIM_BSBFLAP_ENTER, 0.3f);
func_8029C7F4(1, 1, 1, 2);
if (func_8029B2E8() != 0.0f) {
yaw_setIdeal(func_8029B33C());
@@ -114,7 +114,7 @@ void bsbflap_update(void){
func_802A298C();
if(animctrl_isAt(sp18, 0.9f)){
animctrl_setSmoothTransition(sp18, 0);
animctrl_setIndex(sp18, ANIM_BANJO_BFLAP);
animctrl_setIndex(sp18, ASSET_17_ANIM_BSBFLAP);
animctrl_setDuration(sp18, func_802A2858());
animctrl_setPlaybackType(sp18, ANIMCTRL_LOOP);
func_8028774C(sp18, 0.0f);

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

@@ -28,7 +28,7 @@ void _bsbflip_802A2DC0(void){
f32 sp20[3];
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_BFLIP);
animctrl_setIndex(aCtrl, ASSET_4B_ANIM_BSBFLIP_ENTER);
animctrl_setDuration(aCtrl, 2.2f);
func_8028774C(aCtrl, 0.8566f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -44,7 +44,7 @@ void bsbflip_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_BFLIP);
animctrl_setIndex(aCtrl, ASSET_4B_ANIM_BSBFLIP_ENTER);
animctrl_setDuration(aCtrl, 2.3f);
animctrl_setSubRange(aCtrl, 0.0f, 0.7866f);
func_8028774C(aCtrl, 0.0f);
@@ -100,7 +100,7 @@ void bsbflip_update(void){
if(animctrl_isStopped(aCtrl)){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, 0x4C);
animctrl_setIndex(aCtrl, ASSET_4C_ANIM_BSBFLIP_HOLD);
animctrl_setDuration(aCtrl, 0.13f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_LOOP);
func_802875AC(aCtrl, "bsbflip.c", 0xd9);
@@ -116,7 +116,7 @@ void bsbflip_update(void){
if(button_released(BUTTON_A)){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, 0x61);
animctrl_setIndex(aCtrl, ASSET_61_ANIM_BSBFLIP_EXIT);
animctrl_setDuration(aCtrl, 0.8f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsbflip.c", 0xee);

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

@@ -133,7 +133,7 @@ int func_802A37F8(void){
}
void bsbfly_enter_init(void){
func_8028A274(ANIM_BANJO_FLY_ENTER, 1.4f);
func_8028A274(ASSET_45_ANIM_BSBFLY_ENTER, 1.4f);
func_8029C7F4(1,1,3,6);
if(func_8029B2E8() != 0.0f)
yaw_setIdeal(func_8029B33C());
@@ -177,7 +177,7 @@ void bsbfly_enter_end(void){
}
void bsbfly_init(void){
func_8028A010(ASSET_38_BANJO_FLY, 0.62f);
func_8028A010(ASSET_38_ANIM_BSBFLY, 0.62f);
func_8029C7F4(1,1,3,3);
if(miscflag_isTrue(9)){
func_80297970(0.0f);
@@ -200,7 +200,7 @@ void bsbfly_init(void){
void bsbfly_update(void){
enum bs_e sp54 = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
int sp4C;
BKCollisionTri *sp4C;
f32 sp40[3];
f32 sp3C;
f32 sp38;
@@ -278,7 +278,7 @@ void bsbfly_update(void){
sp4C = func_802946F0();
func_8029445C(sp40);
if(sp4C && -1.0 < sp40[1])
if(sp4C != NULL && -1.0 < sp40[1])
sp38 = 0.0f;
func_8029797C(yaw_get());
@@ -320,7 +320,7 @@ int bsbfly_bombHitboxActive(void){
//bsbfly_bomb_init
void func_802A3F9C(void){
f32 sp1C[3];
func_8028A180(ASSET_43_ANIM_BANJO_BEAKBOMB_START, 1.0f);
func_8028A180(ASSET_43_ANIM_BSBFLY_BEAKBOMB_START, 1.0f);
func_8029C7F4(1,1,3,7);
func_802A339C(D_8037D338, sp1C, 4200.0f);
yaw_setIdeal(sp1C[1] + 180.0f);
@@ -415,10 +415,10 @@ void func_802A411C(void) {
if (0.65 > sp34[1]) {
next_state = func_802A40E0();
} else {
next_state = BS_58;
next_state = BS_58_BEAKBOMB_CRASH;
}
} else if (sp40 != 0) {
next_state = BS_58;
next_state = BS_58_BEAKBOMB_CRASH;
}
}
_player_getPosition(sp48);
@@ -449,7 +449,7 @@ void func_802A4430(void){
plyr_animctrl = _player_getAnimCtrlPtr();
animctrl_reset(plyr_animctrl);
animctrl_setTransitionDuration(plyr_animctrl, 0.3f);
animctrl_setIndex(plyr_animctrl, ASSET_CC_ANIM_BANJO_BEAKBOMB_END);
animctrl_setIndex(plyr_animctrl, ASSET_CC_ANIM_BSFLY_BEAKBOMB_END);
animctrl_setDuration(plyr_animctrl, 0.38f);
animctrl_setPlaybackType(plyr_animctrl, ANIMCTRL_LOOP);
func_802875AC(plyr_animctrl, "bsbfly.c", 0x38a);
@@ -526,8 +526,8 @@ void func_802A46C8(void) {
}
void func_802A4748(void) {
func_8028A180(0x3E, 1.4f);
void bsbfly_beakbomb_crash_init(void) {
func_8028A180(ASSET_3E_ANIM_BSBFLY_BEAKBOMB_CRASH, 1.4f);
func_8029C7F4(1, 1, 3, 3);
func_8029E070(1);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
@@ -631,7 +631,7 @@ void func_802A4A78(s32 arg0) {
sp20 = 400.0f;
}
func_802BB3DC(2, 100.0f, 0.85f);
func_8028A274(0xD3, 1.2f);
func_8028A274(ASSET_D3_ANIM_BSBFLY_BEAKBOMB_REBOUND, 1.2f);
func_80299BFC(1.0f);
rumbleManager_80250D94(1.0f, 0.5f, 0.5f);
_player_getPosition(sp3C);
@@ -754,7 +754,7 @@ void func_802A4F44(void){
}
void func_802A4F74(void) {
func_8028A010(ASSET_38_BANJO_FLY, 0.62f);
func_8028A010(ASSET_38_ANIM_BSBFLY, 0.62f);
func_8029C7F4(1, 1, 3, 7);
func_8029E070(1);
func_802914CC(4);
@@ -807,7 +807,7 @@ void func_802A50F8(void){
}
void func_802A5120(void){
func_8028A084(0x68, 0.35f);
func_8028A084(ASSET_68_ANIM_BSJUMP_TUMBLE, 0.35f);
func_8029C7F4(1,1,3,6);
func_80297970(0.0f);
func_80297A0C(0);

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

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
#include "core2/ba/model.h"
#include "core2/statetimer.h"
/* .data */
const f32 D_80364A40 = 80.0f;
@@ -52,9 +54,9 @@ int bslongleg_inSet(s32 move_indx){
}
void func_802A531C(void){
func_80299650(func_80291684(2), func_80291670(2));
if(func_80291700(2, 0.01f))
func_8030E484(0x3eb);
func_80299650(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
if(stateTimer_isAt(STATE_TIMER_2_LONGLEG, 0.01f))
func_8030E484(SFX_3EB_UNKNOWN);
}
void func_802A5374(void){
@@ -81,28 +83,28 @@ void func_802A5404(void){
baModel_setDirection(PLAYER_MODEL_DIR_BANJO);
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_802917C4(2);
stateTimer_clear(STATE_TIMER_2_LONGLEG);
func_803219F4(1);
miscflag_clear(3);
func_8029E180(4, 0.5f);
func_802A531C();
}
void func_802A54A8(void){
void __bsblongleg_enterFromTrot(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_ENTER_AS_BIRD);
animctrl_setIndex(aCtrl, ASSET_40_ANIM_BSLONGLEG_ENTER_FROM_BTROT);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsblongleg.c", 0xe1);
func_802917E4(2, D_8037D35C);
stateTimer_set(STATE_TIMER_2_LONGLEG, D_8037D35C);
func_803219F4(2);
func_8030E2C4(D_8037D361);
D_8037D360 = 1;
}
void func_802A5548(void){
void __bsblongleg_enter(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
@@ -119,9 +121,9 @@ void bsblongleg_enter_init(void){
func_8030E04C(D_8037D361, 0.8f, 1.9f, 1.2f);
miscflag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
if(bsbtrot_inSet(bs_getPrevState()))
func_802A54A8();
__bsblongleg_enterFromTrot();
else
func_802A5548();
__bsblongleg_enter();
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A5374();
@@ -129,21 +131,21 @@ void bsblongleg_enter_init(void){
}
void bsblongleg_enter_update(void){
enum bs_e sp1C = 0;
enum bs_e next_state = 0;
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
func_802A531C();
func_80299594(1, 0.5f);
switch(D_8037D360){
case 0:
if(animctrl_isStopped(aCtrl))
func_802A54A8();
__bsblongleg_enterFromTrot();
break;
case 1:
if(animctrl_isStopped(aCtrl))
sp1C = BS_26_LONGLEG_IDLE;
next_state = BS_26_LONGLEG_IDLE;
break;
}
bs_setState(sp1C);
bs_setState(next_state);
}
void bsblongleg_enter_end(void){
@@ -167,7 +169,7 @@ void bsblongleg_stand_update(void){
next_state = func_802926C0();
if(button_pressed(BUTTON_B))
func_802917C4(2);
stateTimer_clear(STATE_TIMER_2_LONGLEG);
if(func_8029B300() > 0)
next_state = BS_LONGLEG_WALK;
@@ -178,7 +180,7 @@ void bsblongleg_stand_update(void){
if(button_pressed(BUTTON_A) && func_8028B2E8())
next_state = BS_LONGLEG_JUMP;
if(func_802916CC(2))
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
next_state = BS_LONGLEG_EXIT;
if(func_802A51D0())
@@ -204,7 +206,7 @@ void bsblongleg_walk_init(void){
}
void bsblongleg_walk_update(void){
enum bs_e sp1C = 0;
enum bs_e next_state = 0;
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
func_802A531C();
func_80299594(1, 0.5f);
@@ -218,24 +220,24 @@ void bsblongleg_walk_update(void){
func_802A524C();
if(button_pressed(BUTTON_B) && func_80297A64() == 0.0f)
func_802917C4(2);
stateTimer_clear(STATE_TIMER_2_LONGLEG);
if(!func_8029B300() && func_80297C04(1.0f))
sp1C = BS_26_LONGLEG_IDLE;
next_state = BS_26_LONGLEG_IDLE;
if(player_shouldSlideTrot())
sp1C = BS_LONGLEG_SLIDE;
next_state = BS_LONGLEG_SLIDE;
if(button_pressed(BUTTON_A) && func_8028B2E8())
sp1C = BS_LONGLEG_JUMP;
next_state = BS_LONGLEG_JUMP;
if(func_802916CC(2))
sp1C = BS_LONGLEG_EXIT;
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
next_state = BS_LONGLEG_EXIT;
if(func_802A51D0())
sp1C = BS_4C_LANDING_IN_WATER;
next_state = BS_4C_LANDING_IN_WATER;
bs_setState(sp1C);
bs_setState(next_state);
}
void bsblongleg_walk_end(void){
@@ -247,7 +249,7 @@ void func_802A5AB0(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setDirection(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_ENTER_AS_BIRD);
animctrl_setIndex(aCtrl, ASSET_40_ANIM_BSLONGLEG_ENTER_FROM_BTROT);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsblongleg.c", 0x200);
@@ -277,7 +279,7 @@ void bsblongleg_exit_init(void){
}
void bsblongleg_exit_update(void){
enum bs_e sp1C = 0;
enum bs_e next_state = 0;
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
func_802A531C();
func_80299628(1);
@@ -292,14 +294,14 @@ void bsblongleg_exit_update(void){
break;
case 1://L802A5CB4
if(animctrl_isStopped(aCtrl))
sp1C = BS_1_IDLE;
next_state = BS_1_IDLE;
break;
}
if(func_802A51D0())
sp1C = BS_4C_LANDING_IN_WATER;
next_state = BS_4C_LANDING_IN_WATER;
bs_setState(sp1C);
bs_setState(next_state);
}
@@ -312,7 +314,7 @@ void bsblongleg_jump_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
D_8037D350 = 0.14f;
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_JUMP);
animctrl_setIndex(aCtrl, ASSET_3D_ANIM_BSLONGLEG_JUMP);
animctrl_setTransitionDuration(aCtrl, 0.134f);
animctrl_setDuration(aCtrl, 1.0f);
func_8028774C(aCtrl, D_8037D350);
@@ -383,7 +385,7 @@ void bsblongleg_jump_update(void){
if(button_pressed(BUTTON_A))
sp44 = BS_LONGLEG_JUMP;
if(func_802916CC(2))
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
sp44 = BS_LONGLEG_EXIT;
break;
@@ -405,7 +407,7 @@ void bsblongleg_slide_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_JUMP);
animctrl_setIndex(aCtrl, ASSET_3D_ANIM_BSLONGLEG_JUMP);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
func_8028774C(aCtrl, 0.0865f);
func_802875AC(aCtrl, "bsblongleg.c", 0x339);
@@ -468,18 +470,18 @@ void func_802A6394(void){
}
void func_802A63F0(void){
enum bs_e sp1C = 0;
enum bs_e next_state = 0;
func_802A531C();
func_8029C6D0();
func_80299628(1);
if(func_80298850() == 0)
sp1C = BS_26_LONGLEG_IDLE;
next_state = BS_26_LONGLEG_IDLE;
if(func_802A51D0())
sp1C = BS_4C_LANDING_IN_WATER;
next_state = BS_4C_LANDING_IN_WATER;
bs_setState(sp1C);
bs_setState(next_state);
}
void func_802A6450(void){
@@ -495,7 +497,7 @@ void bsblongleg_drone_init(void){
void bsblongleg_drone_update(void){
func_802A531C();
bsdrone_update();
if(func_802916CC(2))
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
bs_setState(BS_LONGLEG_EXIT);
}

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

@@ -82,7 +82,7 @@ void bsbpeck_update(void){
switch(D_8037D374){
case 0://L802A6770
if(animctrl_isAt(aCtrl, 0.9126f)){
animctrl_setIndex(aCtrl, ANIM_BANJO_BPECK_ENTER);
animctrl_setIndex(aCtrl, ASSET_19_ANIM_BSBPECK_ENTER);
func_8028774C(aCtrl, 0.0f);
animctrl_setDuration(aCtrl, 0.35f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_LOOP);

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

@@ -15,7 +15,7 @@ u8 D_8037D382;
void bsbshock_charge_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_BSHOCK_CHARGE);
animctrl_setIndex(aCtrl, ASSET_48_ANIM_BSBSHOCK_CHARGE);
animctrl_setTransitionDuration(aCtrl, 0.4f);
animctrl_setDuration(aCtrl, 4.2f);
animctrl_setSubRange(aCtrl, 0.0f, 0.1061f);
@@ -55,7 +55,7 @@ void bsbshock_charge_update(void){
func_8029C348();
}
func_802B6FA8();
_get_velocity(&sp1C);
_get_velocity(sp1C);
if(button_released(BUTTON_A) && 0.0f < sp1C[1]){
gravity_reset();
}
@@ -126,7 +126,7 @@ void bsbshock_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_BSHOCK_JUMP);
animctrl_setIndex(aCtrl, ASSET_49_ANIM_BSBSHOCK_JUMP);
animctrl_setDuration(aCtrl, 0.8f);
func_8028774C(aCtrl, 0.5304f);
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
@@ -157,7 +157,7 @@ void bsbshock_update(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
func_802B6FA8();
_get_velocity(&sp20);
_get_velocity(sp20);
if(animctrl_isAt(aCtrl, 0.7f))
func_8030E484(SFX_53_BANJO_HUIII);

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

@@ -22,7 +22,7 @@ void func_802A7140() {
f32 func_802A716C() {
f32 sp24[3];
_get_velocity(&sp24);
_get_velocity(sp24);
ml_map_f(gu_sqrtf((sp24[0] * sp24[0]) + (sp24[1] * sp24[1]) + (sp24[2] * sp24[2])), 50.0f, 200.0f, 0.0f, 1.0f);
}
@@ -155,7 +155,7 @@ void func_802A7738(void) {
temp_v0 = _player_getAnimCtrlPtr();
temp_s0 = temp_v0;
animctrl_reset(temp_v0);
animctrl_setIndex(temp_s0, 0x3F);
animctrl_setIndex(temp_s0, ASSET_3F_ANIM_BSSWIM_DIVE_MOVE);
func_8028774C(temp_s0, 0.4626f);
animctrl_setDuration(temp_s0, 1.0f);
func_802875AC(temp_s0, "bsbswim.c", 0x186);
@@ -287,7 +287,7 @@ void func_802A7BD0(void) {
func_8028A274(0x1A0, 1.4f);
func_80299BFC(1.0f);
_player_getPosition(sp30);
func_80294980(&sp24);
func_80294980(sp24);
func_80257F18(sp24, sp30, &sp3C);
yaw_setIdeal(mlNormalizeAngle(sp3C));
yaw_applyIdeal();
@@ -328,9 +328,9 @@ void func_802A7D74(void) {
func_802A75B0();
}
void func_802A7DAC(void) {
void bsSwim_dive_init(void) {
ability_use(ABILITY_3_CAMERA_CONTROL);
func_8028A180(0x3C, 1.0f);
func_8028A180(ASSET_3C_ANIM_BSSWIM_DIVE_ENTER, 1.0f);
func_802A7140();
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297930(0);
@@ -391,7 +391,7 @@ void func_802A7F6C(void) {
}
func_8029B930();
func_8028A010(0xB9, 0.7f);
func_8028A010(ASSET_B9_ANIM_BSSWIM_DIE, 0.7f);
func_802A7140();
func_802A744C();
func_80297B64(1.0f);
@@ -521,14 +521,14 @@ void func_802A846C(void) {
}
if (sp28 > 80.0f) {
animctrl_reset(temp_s0);
animctrl_setIndex(temp_s0, ANIM_BANJO_ROLL);
animctrl_setIndex(temp_s0, ASSET_4F_ANIM_BSTWIRL);
animctrl_setPlaybackType(temp_s0, ANIMCTRL_STOPPED);
animctrl_setDuration(temp_s0, 1.2f);
func_8028774C(temp_s0, 0.8204f);
func_802875AC(temp_s0, "bsbswim.c", 0x417);
} else {
animctrl_reset(temp_s0);
animctrl_setIndex(temp_s0, 0x57);
animctrl_setIndex(temp_s0, ASSET_57_ANIM_BSSWIM_IDLE);
animctrl_setPlaybackType(temp_s0, ANIMCTRL_LOOP);
animctrl_setDuration(temp_s0, 1.2f);
func_8028774C(temp_s0, 0.6412f);

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

@@ -3,6 +3,8 @@
#include "variables.h"
#include "core2/ba/model.h"
#include "core2/statetimer.h"
/* .data */
f32 D_80364A90 = 30.0f;
@@ -24,7 +26,7 @@ f32 D_8037D3A0;
u8 D_8037D3A4;
void func_802A87C0(void){
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_8029C3E8(10.0f, 50.0f);
else
func_8029C22C();
@@ -39,10 +41,10 @@ void func_802A880C(s32 arg0){
void func_802A8850(void){
if( button_pressed(BUTTON_B)
&& func_80291698(3)
&& stateTimer_isActive(STATE_TIMER_3_TURBO_TALON)
&& func_80297A64() == 0.0f
){
func_802917C4(3);
stateTimer_clear(STATE_TIMER_3_TURBO_TALON);
}
}
@@ -51,7 +53,7 @@ f32 func_802A88B0(void){
if(func_8028B128())
return D_80364AA0;
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
return D_80364A9C;
return D_80364A94;
@@ -59,7 +61,7 @@ f32 func_802A88B0(void){
f32 func_802A8900(void){
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
return D_80364A98;
return D_80364A90;
@@ -69,7 +71,7 @@ f32 func_802A8934(void){
if(func_8028B128())
return D_80364AB8;
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
return D_80364AB0;
return D_80364AA8;
@@ -79,7 +81,7 @@ f32 func_802A8984(void){
if(func_8028B128())
return D_80364AB4;
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
return D_80364AAC;
return D_80364AA4;
@@ -109,14 +111,14 @@ void func_802A8A40(void){
}
void func_802A8AD8(void){
func_80299650(func_80291684(3), func_80291670(3));
func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), stateTimer_get(STATE_TIMER_3_TURBO_TALON));
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_802917E4(3, func_80294A40());
stateTimer_set(STATE_TIMER_3_TURBO_TALON, func_80294A40());
func_803219F4(4);
}
if(func_802916CC(3)){
if(stateTimer_isDone(STATE_TIMER_3_TURBO_TALON)){
if(func_8029DFE0()){
func_8029E0DC(0);
if(miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
@@ -142,7 +144,7 @@ void func_802A8BB0(void){
roll_setIdeal(0.0f);
miscflag_clear(3);
if(next_state != BS_5A_LOADZONE)
func_802917E4(3, 0.0f);
stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f);
func_802A8AD8();
func_80289F10(1);
func_8029CF48(4, 0, 0.0f);
@@ -151,7 +153,7 @@ void func_802A8BB0(void){
}
int func_802A8C60(void){
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
return 0;
return button_released(BUTTON_Z);
@@ -167,7 +169,7 @@ void _bsbtrot_802A8C98(AnimCtrl *aCtrl, enum asset_e arg1){
}
enum asset_e func_802A8D00(enum asset_e arg0, enum asset_e arg1){
if(func_802916CC(3))
if(stateTimer_isDone(STATE_TIMER_3_TURBO_TALON))
return arg0;
else
return arg1;
@@ -239,7 +241,7 @@ void bsbtrot_enter_end(void){
}
void bsbtrot_stand_init(void){
func_8028A010(ASSET_26_ANIM_BTROT_IDLE, 1.2f);
func_8028A010(ASSET_26_ANIM_BSBTROT_IDLE, 1.2f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
func_802A8A40();
@@ -249,7 +251,7 @@ void bsbtrot_stand_update(void){
enum bs_e next_state = 0;;
func_802A8850();
func_802A8AD8();
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
func_80299628(1);
next_state = func_802A8D84(next_state);
@@ -263,7 +265,7 @@ void bsbtrot_stand_end(void){
}
enum asset_e func_802A9030(void){
return func_802A8D00(0x15, 0x44);
return func_802A8D00(ASSET_15_ANIM_BSBTROT_WALK, ASSET_44_ANIM_BSBTROT_TURBO_WALK);
}
void func_802A9054(void){
@@ -303,7 +305,7 @@ void bsbtrot_walk_update(void){
func_802A880C(0);
func_8029AD28(0.7781f, 3);
if(func_80291698(3)){
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON)){
func_802A87C0();
}
else{
@@ -371,7 +373,7 @@ void bsbtrot_jump_update(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
func_802A8AD8();
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
if(miscflag_isTrue(0xF))
@@ -520,7 +522,7 @@ void bsbtrot_slide_update(void){
f32 sp2C;
func_802A8AD8();
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
func_80299AAC();
D_8037D3A0 = ml_max_f(D_8037D3A0-time_getDelta(), 0.0f);
@@ -582,7 +584,7 @@ void bsbtrot_fall_update(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
func_802A8AD8();
if(func_80291698(3))
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
if(miscflag_isTrue(0xf))
@@ -676,7 +678,7 @@ void bsbtrot_fall_end(void){
}
void bsbtrot_unk79_init(void){
func_8028A010(ASSET_26_ANIM_BTROT_IDLE, 1.2f);
func_8028A010(ASSET_26_ANIM_BSBTROT_IDLE, 1.2f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A8A40();

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

@@ -76,7 +76,7 @@ void func_802AA58C(enum bs_e *arg0){
}
void bsbwhirl_enter_init(void){
func_8028A274(0x22, 0.5f);
func_8028A274(ASSET_22_ANIM_BSWHIRL_EXIT, 0.5f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
func_8029B324(0, 0.03f);
@@ -130,7 +130,7 @@ void bsbwhirl_stand_end(void){
}
void bsbwhirl_walk_init(void){
func_8028A010(ASSET_11_ANIM_BSWONDERWING_WALK, 0.53f);
func_8028A010(ASSET_11_ANIM_BSWHIRL_WALK, 0.53f);
func_80289EC8(D_80364AD0, D_80364AD4, D_80364AD8, D_80364ADC);
func_8029C7F4(2,1,1,2);
@@ -171,7 +171,7 @@ void bsbwhirl_jump_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_WONDERWING_JUMP);
animctrl_setIndex(aCtrl, ASSET_1B_ANIM_BSWHIRL_JUMP);
animctrl_setDuration(aCtrl, 0.8f);
animctrl_setTransitionDuration(aCtrl, 0.134f);
func_8028774C(aCtrl, 0.14f);
@@ -244,7 +244,7 @@ void bsbwhirl_exit_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setDirection(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_WONDERWING_EXIT);
animctrl_setIndex(aCtrl, ASSET_22_ANIM_BSWHIRL_EXIT);
animctrl_setDuration(aCtrl, 0.5f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsbwhirl.c", 0x201);

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

@@ -57,7 +57,7 @@ void bsbbuster_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_BBUSTER);
animctrl_setIndex(aCtrl, ASSET_1D_ANIM_BSBBUSTER);
animctrl_setDuration(aCtrl, 1.02f);
animctrl_setSubRange(aCtrl, 0.0f, 0.35f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "bsint.h"
#include "core2/statetimer.h"
/* .data */
const f32 D_80364AF0 = 30.0f;
@@ -101,7 +102,7 @@ void bscarry_interrupt(void){
func_8028DE6C(baMarker_getCarriedObjectActorId());
break;
case BS_INTR_16_THROW_CARRIED_OBJ:
if(func_802916CC(1)){
if(stateTimer_isDone(STATE_TIMER_1_THROW)){
bs_setState(BS_CARRY_THROW);
func_8029A86C(2);
}

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

@@ -125,7 +125,7 @@ void bsclimb_idle_end(void){
}
void bsclimb_move_init(void){
func_8028A010(ASSET_A_ANIM_BANJO_CLIMB_MOVE, 0.9f);
func_8028A010(ASSET_A_ANIM_BSCLIMB_MOVE, 0.9f);
func_80289F10(3);
func_80289EA8(0.3f, 1.5f);
func_80289EC8(100.0f, 300.0f, 0.6f, 0.4f);

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

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/statetimer.h"
int bscroc_inSet(enum bs_e state);
@@ -32,7 +32,7 @@ u8 D_8037D3F5;
/* .code */
f32 func_802ABDC0(void){
if(func_80291670(3) != 0.0f)
if(stateTimer_get(STATE_TIMER_3_TURBO_TALON) != 0.0f)
return D_80364B08;
else
return D_80364B04;
@@ -45,11 +45,11 @@ void func_802ABE04(void){
}
void func_802ABE70(void){
f32 sp1C = func_80291670(3);
func_80299650(func_80291684(3), sp1C);
f32 sp1C = stateTimer_get(STATE_TIMER_3_TURBO_TALON);
func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), sp1C);
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_802917E4(3, func_80294A40());
stateTimer_set(STATE_TIMER_3_TURBO_TALON, func_80294A40());
func_8025A6EC(COMUSIC_8A_GETTING_TURBO_TRAINERS, -1);
func_8029E0DC(1);
}
@@ -58,9 +58,9 @@ void func_802ABE70(void){
func_8029C3E8(0.0f, 30.0f);
}
if(func_80291700(3, 0.01f)){
if(stateTimer_isAt(STATE_TIMER_3_TURBO_TALON, 0.01f)){
func_8029E0DC(0);
func_8030E58C(0x3eb, 1.35f);
func_8030E58C(SFX_3EB_UNKNOWN, 1.35f);
}
}

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

@@ -10,17 +10,17 @@ u8 D_8037D404;
enum bs_e func_802ADCD4(enum bs_e arg0);
void func_802AD6D0(void){
func_8028A010(ANIM_BANJO_CROUCH, 0.5f);
func_8028A010(ASSET_10C_ANIM_BSCROUCH_IDLE, 0.5f);
D_8037D404 = 4;
}
void func_802AD6FC(void){
func_8028A180(ANIM_BANJO_CROUCH_NOINPUT, 2.0f);
func_8028A180(ASSET_116_ANIM_BSCROUCH_NOINPUT, 2.0f);
D_8037D404 = 2;
}
void func_802AD728(void){
func_8028A1F4(ANIM_BANJO_CROUCH, 0.5f, 0.9999f);
func_8028A1F4(ASSET_10C_ANIM_BSCROUCH_IDLE, 0.5f, 0.9999f);
func_8029E3C0(2, 2.0f);
D_8037D404 = 1;
}
@@ -51,7 +51,7 @@ void bscrouch_init(void){
break;
}
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_CROUCH_ENTER);
animctrl_setIndex(aCtrl, ASSET_1_ANIM_BSCROUCH_ENTER);
animctrl_setDuration(aCtrl, 0.5f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_8028774C(aCtrl, sp24);

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

@@ -27,7 +27,7 @@ void bsdie_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ASSET_9_ANIM_BANJO_DIE);
animctrl_setIndex(aCtrl, ASSET_9_ANIM_BSDIE);
animctrl_setSubRange(aCtrl, 0.0f, 0.3356f);
animctrl_setDuration(aCtrl, 2.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -73,7 +73,7 @@ void func_802AECE4(void){
&& animctrl_getIndex(aCtrl) == ASSET_3_ANIM_BSWALK
){
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_RUN);
animctrl_setIndex(aCtrl, ASSET_C_ANIM_BSWALK_RUN);
func_802875AC(aCtrl, "bsdronegoto.c", 0x9d);
}

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

@@ -332,7 +332,7 @@ void bsdronexform_init(void){
func_80294378(6);
func_802AFB0C();
func_802B016C();
D_8037D470.player_transformation = _player_getTransformation();
D_8037D470.player_transformation = bsStoredState_getTransformation();
D_8037D470.room_transformation = func_80294A4C();
miscflag_set(MISC_FLAG_1B_TRANSFORMING);
D_8037D470.state = 0;

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

@@ -23,7 +23,7 @@ void bsjig_jiggy_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, ANIM_BANJO_BJIG_JIGGY);
animctrl_setIndex(aCtrl, ASSET_2E_ANIM_BSJIG_JIGGY);
animctrl_setDuration(aCtrl, 4.3f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsjig.c", 0x7f);
@@ -43,13 +43,13 @@ void bsjig_jiggy_init(void){
miscflag_clear(7);
miscflag_clear(0xf);
baMarker_collisionOff();
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 1);
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 1);
D_8037D4B0 = 0;
}
void func_802B0BA8(void){
if(bsjig_gJiggyMarker){
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 4);
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 4);
}
}
@@ -84,7 +84,7 @@ void bsjig_jiggy_update(void){
void func_802B0CD8(void){
if(bsjig_gJiggyMarker){
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 5);
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 5);
bsjig_gJiggyMarker = NULL;
}
}

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

@@ -386,7 +386,7 @@ bool bsjump_jumpingFromWater(void){
}
void bsjump_tumble_init(void){
func_8028A084(0x68, 0.35f);
func_8028A084(ASSET_68_ANIM_BSJUMP_TUMBLE, 0.35f);
func_8029C7F4(1,1,3,6);
baModel_setYDisplacement(60.0f);
if(func_80293234() == 1){

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

@@ -16,7 +16,7 @@ void bsow_init(void){
animctrl_reset(plyr_mvmnt);
animctrl_setSmoothTransition(plyr_mvmnt, 0);
animctrl_setSubRange(plyr_mvmnt, 0.0f, 0.534399986267f);
animctrl_setIndex(plyr_mvmnt, ANIM_BANJO_OW);
animctrl_setIndex(plyr_mvmnt, ASSET_4D_ANIM_BSOW);
animctrl_setDuration(plyr_mvmnt, 1.70000004768f);
animctrl_setPlaybackType(plyr_mvmnt, ANIMCTRL_ONCE);
func_802875AC(plyr_mvmnt, "bsow.c", 0x50);

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

@@ -51,13 +51,13 @@ void bsslide_init(void){
f32 sp2C;
f32 sp28;
f32 tmp_f0;
D_8037D520 = ANIM_BANJO_SLIDE_FRONT;
D_8037D520 = ASSET_5A_ANIM_BSSLIDE_FRONT;
if(player_isSliding()){
func_80294480(sp30);
if(func_80258108(sp30, &sp28, &sp2C)){
tmp_f0 = mlNormalizeAngle(yaw_get() - sp28);
if(tmp_f0 < 90.0f || 270.0f < tmp_f0){
D_8037D520 = ANIM_BANJO_SLIDE_BACK;
D_8037D520 = ASSET_59_ANIM_BSSLIDE_BACK;
}
}
}

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

@@ -57,7 +57,7 @@ void bssplat_update(void){
sp1C = BS_2F_FALL;
if(animctrl_isStopped(aCtrl)){
func_8028A180(ASSET_D2_ANIM_BANJO_GETTING_UP, 2.25f);
func_8028A180(ASSET_D2_ANIM_BSSPLAT, 2.25f);
D_8037D530 = 1;
}
break;

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

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "bsint.h"
#include "core2/statetimer.h"
extern f32 func_8029B2E8(void);
void yaw_setVelocityBounded(f32, f32);
@@ -59,7 +60,7 @@ s32 func_802B488C(s32 arg0){
retVal = BS_WALK;
break;
case 4: //L802B48D4
retVal = BS_WALK_FAST;
retVal = BS_4_WALK_FAST;
break;
}
if(button_held(BUTTON_Z))
@@ -211,12 +212,12 @@ void bsstand_update(void) {
if (animctrl_isAt(anim_ctrl, 0.9999f)) func_8029E070(0);
}//L802B50E4
} else if (sp18 & 0x20) {
if (animctrl_getIndex(anim_ctrl) == 0x95) {
if (animctrl_getIndex(anim_ctrl) == ASSET_95_ANIM_BSSTAND_KAZOOIE_PECK) {
func_802B4A10(anim_ctrl);
if (animctrl_isAt(anim_ctrl, 0.37f)) {
animctrl_reset(anim_ctrl);
animctrl_setTransitionDuration(anim_ctrl, 0.1f);
animctrl_setIndex(anim_ctrl, 0xF6);
animctrl_setIndex(anim_ctrl, ASSET_F6_ANIM_BSSTAND_PULL_KAZOOIE);
animctrl_setDuration(anim_ctrl, 5.0f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
func_802875AC(anim_ctrl, "bsstand.c", 0x170);
@@ -240,12 +241,12 @@ void bsstand_update(void) {
D_8037D540 = func_802B4870(D_8037D540);
sp18 = D_80364D20[D_8037D540];
if (sp18 & 0x10) {
func_8028A180(0x95, 5.5f);
func_8028A180(ASSET_95_ANIM_BSSTAND_KAZOOIE_PECK, 5.5f);
_func_802875AC(anim_ctrl, "bsstand.c", 0x1AB);
func_8029E070(1);
func_802900FC();
} else if (sp18 & 0x20) {
func_8028A180(0x95, 5.5f);
func_8028A180(ASSET_95_ANIM_BSSTAND_KAZOOIE_PECK, 5.5f);
func_8029E070(1);
func_802900FC();
} else if (sp18 & 8) {
@@ -287,7 +288,7 @@ void bsstand_landing_update(void){
s32 sp1C = 0;
AnimCtrl * sp18 = _player_getAnimCtrlPtr();
if(animctrl_getIndex(sp18) == 0xd2){
if(animctrl_getIndex(sp18) == ASSET_D2_ANIM_BSSPLAT){
if(animctrl_isAt(sp18, 0.8264f)){
func_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
}
@@ -312,7 +313,7 @@ void func_802B5350(void){
bs_setState(0x52);
}
if(sp1C == 0x7){
if(_player_getTransformation() != TRANSFORM_1_BANJO)
if(bsStoredState_getTransformation() != TRANSFORM_1_BANJO)
func_8029A86C(1);
else{
func_802948F8(baMarker_8028D688());
@@ -321,7 +322,7 @@ void func_802B5350(void){
}
else if(sp1C == 0x12){//L802B53D0
func_8029A86C(1);
if( _player_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && func_802916CC(0)){
if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){
func_8028DE6C(baMarker_getCarriedObjectActorId());
func_8029A86C(2);
}

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

@@ -15,13 +15,13 @@ s16 D_80364D50[10] = {
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
ASSET_58_ANIM_BSSWIM_IDLE2,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
ASSET_58_ANIM_BSSWIM_IDLE2,
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
0x58
ASSET_58_ANIM_BSSWIM_IDLE2,
ASSET_58_ANIM_BSSWIM_IDLE2
};
/* .bss */
@@ -196,9 +196,9 @@ void func_802B5B18(void) {
} else {
anim_duration = 0.4f;
}
if (animctrl_getIndex(anim_ctrl) != ASSET_39_ANIM_BSSWIM_SWIM) {
if (animctrl_getIndex(anim_ctrl) != ASSET_39_ANIM_BSSWIM_MOVE) {
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, ASSET_39_ANIM_BSSWIM_SWIM);
animctrl_setIndex(anim_ctrl, ASSET_39_ANIM_BSSWIM_MOVE);
animctrl_setTransitionDuration(anim_ctrl, anim_duration);
func_8028774C(anim_ctrl, 0.8f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);

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

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/statetimer.h"
extern ActorMarker *carriedobj_getMarker(void);
@@ -56,8 +57,8 @@ void bsthrow_update(void){
void bsthrow_end(void){
D_8037D580 = 0;
if(bs_getNextState() == BS_1_IDLE){
func_802917E4(0, 0.14f);
func_802917E4(1, 0.28f);
stateTimer_set(STATE_TIMER_0_UNKNOWN, 0.14f);
stateTimer_set(STATE_TIMER_1_THROW, 0.28f);
}
}

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

@@ -8,7 +8,7 @@ f32 func_8029B41C(void);
void func_802BF2C0(f32);
void func_802B6270(void){
func_8028A180(0x77, 3.2f);
func_8028A180(ASSET_77_ANIM_BSTIMEOUT, 3.2f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802914CC(0xd);

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

@@ -12,7 +12,7 @@ void bsturn_init(void){
f32 sp28[3];
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_TURN);
animctrl_setIndex(aCtrl, ASSET_E_ANIM_BSTURN);
animctrl_setDuration(aCtrl, 0.3f);
animctrl_setTransitionDuration(aCtrl,0.1f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -49,7 +49,7 @@ void bsturn_update(void){
}//L802B6978
if(animctrl_isStopped(_player_getAnimCtrlPtr()))
sp2C = BS_WALK_FAST;
sp2C = BS_4_WALK_FAST;
if(button_held(BUTTON_Z))
sp2C = BS_CROUCH;

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

@@ -16,7 +16,7 @@ void bstwirl_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_ROLL);
animctrl_setIndex(aCtrl, ASSET_4F_ANIM_BSTWIRL);
animctrl_setDuration(aCtrl, 0.9f);
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -126,7 +126,7 @@ void bswalk_creep_init(void){
sp20 = 0.0f;
}
animctrl_reset(s0);
animctrl_setIndex(s0, ANIM_BANJO_WALK_CREEP);
animctrl_setIndex(s0, ASSET_2_ANIM_BSWALK_CREEP);
animctrl_setDuration(s0, 0.43f);
func_8028774C(s0, sp20);
animctrl_setPlaybackType(s0, ANIMCTRL_LOOP);
@@ -158,7 +158,7 @@ void bswalk_creep_update(void){
s0 = BS_WALK;
break;
case 4:
s0 = BS_WALK_FAST;
s0 = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
@@ -231,7 +231,7 @@ void bswalk_slow_upate(void){
s0 = BS_WALK;
break;
case 4:
s0 = BS_WALK_FAST;
s0 = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
@@ -276,7 +276,7 @@ void bswalk_init(void){
break;
}
animctrl_reset(s0);
animctrl_setIndex(s0, ANIM_BANJO_RUN);
animctrl_setIndex(s0, ASSET_C_ANIM_BSWALK_RUN);
animctrl_setDuration(s0, 0.66f);
animctrl_setTransitionDuration(s0, 0.14f);
func_8028774C(s0, sp20);
@@ -303,7 +303,7 @@ void bswalk_update(void){
s0 = BS_2_WALK_SLOW;
break;
case 4:
s0 = BS_WALK_FAST;
s0 = BS_4_WALK_FAST;
break;
}//L802B76B8
if(func_8028B128())
@@ -360,7 +360,7 @@ void bswalk_fast_init(void){
}
animctrl_reset(s0);
animctrl_setSmoothTransition(s0, sp24);
animctrl_setIndex(s0, ANIM_BANJO_RUN);
animctrl_setIndex(s0, ASSET_C_ANIM_BSWALK_RUN);
animctrl_setDuration(s0, 0.66f);
animctrl_setTransitionDuration(s0, 0.1f);
func_8028774C(s0, sp28);
@@ -444,7 +444,7 @@ void bswalk_fast_end(void){
}
void bswalk_mud_init(void){
func_8028A010(ANIM_BANJO_WALK_MUD, 0.43f);
func_8028A010(ASSET_B_ANIM_BSWALK_MUD, 0.43f);
func_8029C7F4(2,1,1,2);
func_80289EA8(0.3f, 1.5f);
func_80289EC8(D_80364D84, D_80364D88, D_80364DB0, D_80364DB4);