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

bs animation enum update

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-30 15:35:06 -06:00
parent 7f2339a0f7
commit 3bc8000903
26 changed files with 161 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ void bsant_jump_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
func_8029E554();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_TERMITE_JUMP);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSTERMITE_JUMP);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setTransitionDuration(aCtrl, 0.1f);
func_8028774C(aCtrl, 0.2987f);
@@ -232,7 +232,7 @@ void bsant_fall_init(void){
func_8029E554();
D_8037D298 = 0;
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_TERMITE_JUMP);
animctrl_setIndex(aCtrl, ASSET_60_ANIM_BSTERMITE_JUMP);
animctrl_setDuration(aCtrl, 1.9f);
func_8028774C(aCtrl, 0.4423f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
@@ -283,7 +283,7 @@ static void __bsant_recoil_init(int take_damage){
func_8029E554();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_TERMITE_OW);
animctrl_setIndex(aCtrl, ASSET_28_ANIM_BSTERMITE_OW);
animctrl_setDuration(aCtrl, 1.4f);
animctrl_setSubRange(aCtrl, 0.0f, 0.4899f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -373,7 +373,7 @@ void bsant_die_init(void){
func_8029B930();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_TERMITE_DIE);
animctrl_setIndex(aCtrl, ASSET_29_ANIM_BSTERMITE_DIE);
animctrl_setSubRange(aCtrl, 0.0f, 0.523f);
animctrl_setDuration(aCtrl, 1.6f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -8,7 +8,7 @@ u8 D_8037D2E1;
/* .code */
void bseggass_init(void){
func_8028A274(0x2B, 1.0f);
func_8028A274(ASSET_2B_ANIM_BSEGGASS, 1.0f);
func_8029C7F4(1,3,1,3);
func_80299234(350.0f, 14.0f);
func_80297970(0.0f);

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

@@ -11,7 +11,7 @@ u8 D_8037D2F1;
/* .code */
void bsegghead_init(void){
func_8028A274(0x2A, 1.0f);
func_8028A274(ASSET_2A_ANIM_BSEGGHEAD, 1.0f);
func_8029C7F4(1,3,1,3);
func_80299234(350.0f, 14.0f);
func_80297970(0.0f);

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

@@ -106,7 +106,7 @@ void func_802A5548(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_ENTER_AS_BEAR);
animctrl_setIndex(aCtrl, ASSET_16_ANIM_BSBTROT_ENTER);
animctrl_setDuration(aCtrl, 0.5f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsblongleg.c", 0xf6);
@@ -259,7 +259,7 @@ void func_802A5B34(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_BTROT_EXIT);
animctrl_setIndex(aCtrl, ASSET_7_ANIM_BSBTROT_EXIT);
animctrl_setDuration(aCtrl, 0.6f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsblongleg.c", 0x210);

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

@@ -36,7 +36,7 @@ void bsbpeck_init(void){
if(func_80293234() == 1)
func_80293240(2);
func_8028A274(0x1a, 0.2f);
func_8028A274(ASSET_1A_ANIM_BSBPECK, 0.2f);
func_8029C7F4(1,3,1,6);
func_80299234(1200.0f, 10.0f);
func_8029E070(1);
@@ -101,7 +101,7 @@ void bsbpeck_update(void){
if(D_8037D370 < 0.0f){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, 0);
animctrl_setIndex(aCtrl, ANIM_BANJO_BPECK);
animctrl_setIndex(aCtrl, ASSET_1A_ANIM_BSBPECK);
animctrl_setDirection(aCtrl, 0);
animctrl_setDuration(aCtrl, 0.2f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -210,7 +210,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
void bsbtrot_enter_init(void){
func_802A8AD8();
func_8028A274(0x16, 1.0f);
func_8028A274(ASSET_16_ANIM_BSBTROT_ENTER, 1.0f);
func_8029C7F4(1,1,2,2);
func_80297970(0.0f);
func_802A8A40();
@@ -342,7 +342,7 @@ void bsbtrot_jump_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_BTROT_JUMP);
animctrl_setIndex(aCtrl, ASSET_27_ANIM_BSBTROR_JUMP);
animctrl_setDuration(aCtrl, 1.4f);
animctrl_setTransitionDuration(aCtrl, 0.1f);
func_8028774C(aCtrl, 0.2f);
@@ -477,7 +477,7 @@ void bsbtrot_jump_end(void){
}
void bsbtrot_exit_init(void){
func_8028A274(7, 0.6f);
func_8028A274(ASSET_7_ANIM_BSBTROT_EXIT, 0.6f);
func_80289F10(1);
func_80297970(0.0f);
}
@@ -497,7 +497,7 @@ void bsbtrot_exit_end(void){
void bsbtrot_slide_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_BTROT_JUMP);
animctrl_setIndex(aCtrl, ASSET_27_ANIM_BSBTROR_JUMP);
func_8028774C(aCtrl, 0.069f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
func_802875AC(aCtrl, "bsbtrot.c", 0x382);
@@ -564,7 +564,7 @@ int bsbtrot_inSet(s32 move_indx){
void bsbtrot_fall_init(void){
AnimCtrl * aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_BTROT_JUMP);
animctrl_setIndex(aCtrl, ASSET_27_ANIM_BSBTROR_JUMP);
animctrl_setDuration(aCtrl, 1.4f);
func_8028774C(aCtrl, 0.4653f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
@@ -706,7 +706,7 @@ void bsbtrot_ow_init(void){
func_802A8A40();
func_80298760(func_80296560());
func_8028A274(0x66, 1.1f);
func_8028A274(ASSET_66_ANIM_BSBTROT_OW, 1.1f);
func_80299BFC(1.0f);
_player_getPosition(sp30);
func_80294980(sp24);

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

@@ -29,7 +29,7 @@ void func_802AAEE0(void){
void bscarry_idle_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x72);
animctrl_setIndex(aCtrl, ASSET_72_ANIM_BSCARRY_IDLE);
animctrl_setDuration(aCtrl, 1.2f);
func_802875AC(aCtrl, "bscarry.c", 0x6f);
func_8029C7F4(1,1,1,2);
@@ -57,7 +57,7 @@ void bscarry_idle_end(void){
void bscarry_walk_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x73);
animctrl_setIndex(aCtrl, ASSET_73_ANIM_BSCARRY_WALK);
animctrl_setDuration(aCtrl, 0.8f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_LOOP);
func_802875AC(aCtrl, "bscarry.c", 0xac);

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

@@ -182,7 +182,7 @@ void bscroc_jump_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, 0x11C);
animctrl_setIndex(aCtrl, ASSET_11C_ANIM_BSCROC_JUMP);
animctrl_setSubRange(aCtrl, 0.0f, 0.35f);
animctrl_setDuration(aCtrl, 1.0f);
func_8028774C(aCtrl, 0.1f);
@@ -271,7 +271,7 @@ void bscroc_fall_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x11C);
animctrl_setIndex(aCtrl, ASSET_11C_ANIM_BSCROC_JUMP);
func_8028774C(aCtrl, 0.5036f);
animctrl_setDuration(aCtrl, 0.7f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
@@ -332,7 +332,7 @@ static void __bscroc_recoil_init(s32 damage){
f32 sp20[3];
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x11d);
animctrl_setIndex(aCtrl, ASSET_11D_ANIM_BSCROC_BOUNCE);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setSubRange(aCtrl, 0.0f, 0.7518f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -421,7 +421,7 @@ void bscroc_die_init(void){
func_8029B930();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, 0x11e);
animctrl_setIndex(aCtrl, ASSET_11E_ANIM_BSCROC_DIE);
animctrl_setSubRange(aCtrl, 0.0f, 0.3966f);
animctrl_setDuration(aCtrl, 1.7f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -70,7 +70,7 @@ void func_802AECE4(void){
}
if( 250.0f <= gu_sqrtf(sp20[0]*sp20[0] + sp20[2]*sp20[2])
&& animctrl_getIndex(aCtrl) == ASSET_3_ANIM_BANJO_WALK
&& animctrl_getIndex(aCtrl) == ASSET_3_ANIM_BSWALK
){
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_RUN);

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

@@ -164,7 +164,7 @@ void bsjig_notedoor_init(void){
D_8037D4B2 = (bs_getPrevState() == BS_44_JIG_JIGGY);
miscflag_clear(0x1A);
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x282);
animctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR);
animctrl_setDuration(aCtrl, 3.6f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsjig.c", 0x14d);

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

@@ -51,7 +51,7 @@ void bsjump_init(void){
else {
D_8037D4C1 = (sp30 == BS_2D_SWIM_IDLE) || (sp30 == BS_2E_SWIM);
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_JUMP);
animctrl_setIndex(aCtrl, ASSET_8_ANIM_BSJUMP);
animctrl_setDuration(aCtrl, 1.9f);
animctrl_setTransitionDuration(aCtrl, 0.134f);
func_8028774C(aCtrl, 0.3f);
@@ -178,7 +178,7 @@ void bsjump_fall_init(void){
sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1;
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, sp20);
animctrl_setIndex(aCtrl, 0xb0);
animctrl_setIndex(aCtrl, ASSET_B0_ANIM_BSJUMP_FALL);
animctrl_setTransitionDuration(aCtrl, 0.3f);
animctrl_setDuration(aCtrl, 0.38f);
func_802875AC(aCtrl, "bsjump.c", 0x188);
@@ -202,7 +202,7 @@ void bsjump_fall_update(void){
case 0://L802B17B8
if(func_8028B254(0x5a)){
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 8);
animctrl_setIndex(aCtrl, ASSET_8_ANIM_BSJUMP);
func_8028774C(aCtrl, 0.6667f);
animctrl_setDuration(aCtrl, 2.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -253,7 +253,7 @@ void func_802B1928(void) {
anim_ctrl = _player_getAnimCtrlPtr();
climbRelease();
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, ANIM_BANJO_JUMP);
animctrl_setIndex(anim_ctrl, ASSET_8_ANIM_BSJUMP);
animctrl_setDuration(anim_ctrl, 1.9f);
animctrl_setTransitionDuration(anim_ctrl, 0.134f);
func_8028774C(anim_ctrl, 0.3f);
@@ -334,7 +334,7 @@ void func_802B1BF4(void) {
}
animctrl_reset(anim_ctrl);
animctrl_setSmoothTransition(anim_ctrl, smooth_transition);
animctrl_setIndex(anim_ctrl, ANIM_BANJO_JUMP);
animctrl_setIndex(anim_ctrl, ASSET_8_ANIM_BSJUMP);
animctrl_setTransitionDuration(anim_ctrl, 0.3f);
animctrl_setDuration(anim_ctrl, 1.9f);
func_8028774C(anim_ctrl, 0.6667f);

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

@@ -71,8 +71,8 @@ int bspumpkin_inSet(s32 move_indx){
|| (move_indx == BS_93_PUMPKIN_DRONE);
}
void func_802B2384(void) {
func_8028A084(0xA0, 0.8f);
void bspumpkin_idle_init(void) {
func_8028A084(ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.8f);
func_8029C7F4(1, 1, 1, 2);
func_80297970(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
@@ -83,7 +83,7 @@ void func_802B2384(void) {
func_802900B4();
}
void func_802B242C(void) {
void bspumpkin_idle_update(void) {
s32 next_state;
next_state = 0;
@@ -103,17 +103,17 @@ void func_802B242C(void) {
}
void func_802B24AC(void){
void bspumpkin_idle_end(void){
func_802B229C();
func_802900FC();
}
void func_802B24D4(void) {
void bspumpkin_walk_init(void) {
AnimCtrl *anim_ctrl;
anim_ctrl = _player_getAnimCtrlPtr();
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0xA0);
animctrl_setIndex(anim_ctrl, ASSET_A0_ANIM_BSPUMPKIN_WALK);
animctrl_setDuration(anim_ctrl, 0.8f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);
_func_802875AC(anim_ctrl, "bspumpkin.c", 0x11D);
@@ -123,7 +123,7 @@ void func_802B24D4(void) {
}
void func_802B2580(void) {
void bspumpkin_walk_update(void) {
s32 next_state;
next_state = 0;
@@ -141,17 +141,17 @@ void func_802B2580(void) {
bs_setState(next_state);
}
void func_802B2610(void){
void bspumpkin_walk_end(void){
func_802B229C();
func_802900FC();
}
void func_802B2638(void) {
void bspumpkin_jump_init(void) {
AnimCtrl *anim_ctrl;
anim_ctrl = _player_getAnimCtrlPtr();
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0xA1);
animctrl_setIndex(anim_ctrl, ASSET_A1_ANIM_BSPUMPKIN_JUMP);
animctrl_setSubRange(anim_ctrl, 0.0f, 0.3941f);
animctrl_setDuration(anim_ctrl, 1.2f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
@@ -169,7 +169,7 @@ void func_802B2638(void) {
D_8037D4E0 = 0;
}
void func_802B2750(void) {
void bspumpkin_jump_update(void) {
s32 next_state;
AnimCtrl *anim_ctrl;
f32 sp1C[3];
@@ -233,19 +233,19 @@ void func_802B2750(void) {
bs_setState(next_state);
}
void func_802B2990(void){
void bspumpkin_jump_end(void){
func_80292EA4();
gravity_reset();
func_802B229C();
}
void func_802B29C0(void) {
void bspumpkin_fall_init(void) {
AnimCtrl *anim_ctrl;
anim_ctrl = _player_getAnimCtrlPtr();
D_8037D4E4 = 0;
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0xA1);
animctrl_setIndex(anim_ctrl, ASSET_A1_ANIM_BSPUMPKIN_JUMP);
func_8028774C(anim_ctrl, 0.662f);
animctrl_setDuration(anim_ctrl, 0.7f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_STOPPED);
@@ -255,7 +255,7 @@ void func_802B29C0(void) {
}
void func_802B2A5C(void) {
void bspumpkin_fall_update(void) {
s32 next_state;
AnimCtrl *anim_ctrl;
f32 sp1C[3];
@@ -297,14 +297,14 @@ void func_802B2A5C(void) {
bs_setState(next_state);
}
void func_802B2BD0(void){
void bspumpkin_fall_end(void){
func_802B229C();
}
void func_802B2BF0(void) {
func_8029656C(D_8037D4E8);
func_8028FAB0(D_8037D4E8);
func_8028A084(0xA0, 0.8f);
func_8028A084(ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.8f);
func_8029C7F4(1, 1, 2, 7);
func_80294378(6);
func_8029E3C0(0, 0.0f);
@@ -333,7 +333,7 @@ void func_802B2D50(void) {
baModel_setScale(1.0f);
}
void func_802B2D80(s32 arg0) {
void __bspumpkin_bounce_init(s32 arg0) {
AnimCtrl *anim_ctrl;
f32 sp38;
f32 plyr_pos[3];
@@ -341,7 +341,7 @@ void func_802B2D80(s32 arg0) {
anim_ctrl = _player_getAnimCtrlPtr();
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0x236);
animctrl_setIndex(anim_ctrl, ASSET_236_ANIM_BSPUMPKIN_REBOUND);
animctrl_setDuration(anim_ctrl, 1.3f);
animctrl_setSubRange(anim_ctrl, 0.0f, 0.45f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
@@ -367,7 +367,7 @@ void func_802B2D80(s32 arg0) {
D_8037D4E0 = 0;
}
void func_802B2EE8(void) {
void __bspumpkin_bounce_update(void) {
s32 next_state;
next_state = 0;
@@ -391,7 +391,7 @@ void func_802B2EE8(void) {
bs_setState(next_state);
}
void func_802B2F9C(void) {
void __bspumpkin_bounce_end(void) {
func_80297CA8();
gravity_reset();
baMarker_collisionOn();
@@ -399,31 +399,31 @@ void func_802B2F9C(void) {
func_802B229C();
}
void func_802B2FDC(void){
func_802B2D80(1);
void __bspumpkin_ow_init(void){
__bspumpkin_bounce_init(1);
}
void func_802B2FFC(void){
func_802B2EE8();
void __bspumpkin_ow_update(void){
__bspumpkin_bounce_update();
}
void func_802B301C(void){
func_802B2F9C();
void __bspumpkin_ow_end(void){
__bspumpkin_bounce_end();
}
void func_802B303C(void){
func_802B2D80(2);
void bspumpkin_rebound_init(void){
__bspumpkin_bounce_init(2);
}
void func_802B305C(void){
func_802B2EE8();
void bspumpkin_rebound_update(void){
__bspumpkin_bounce_update();
}
void func_802B307C(void){
func_802B2F9C();
void bspumpkin_rebound_end(void){
__bspumpkin_bounce_end();
}
void func_802B309C(void) {
void bspumpkin_die_init(void) {
AnimCtrl *anim_ctrl;
f32 sp38;
f32 plyr_pos[3];
@@ -433,7 +433,7 @@ void func_802B309C(void) {
func_8029B930();
animctrl_reset(anim_ctrl);
animctrl_setSmoothTransition(anim_ctrl, 0);
animctrl_setIndex(anim_ctrl, 0x188);
animctrl_setIndex(anim_ctrl, ASSET_188_ANIM_BSPUMPKIN_DIE);
animctrl_setSubRange(anim_ctrl, 0.0f, 0.1439f);
animctrl_setDuration(anim_ctrl, 3.5f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
@@ -461,7 +461,7 @@ void func_802B309C(void) {
D_8037D4E0 = 0;
}
void func_802B3240(void){
void bspumpkin_die_update(void){
func_80297970(D_8037D4F4);
func_80299628(0);
switch(D_8037D4E0){
@@ -520,7 +520,7 @@ void func_802B3240(void){
bs_setState(0);
}
void func_802B3448(void) {
void bspumpkin_die_end(void) {
func_802B229C();
func_8024BD08(0);
gravity_reset();

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

@@ -97,7 +97,7 @@ void func_802B3868(void) {
animctrl_reset(anim_ctrl);
animctrl_setSmoothTransition(anim_ctrl, 0);
animctrl_setSubRange(anim_ctrl, 0.0f, 0.5823f);
animctrl_setIndex(anim_ctrl, 0xF);
animctrl_setIndex(anim_ctrl, ASSET_F_ANIM_BSREBOUND);
animctrl_setDuration(anim_ctrl, sp20);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
_func_802875AC(anim_ctrl, "bsrebound.c", 0xC6);

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

@@ -57,13 +57,13 @@ bool func_802B3BB0(void) {
case 0x167:
if (baanim_isStopped() != 0) {
if (animctrl_isPlayedForwards(anim_ctrl) != 0) {
func_8028A010(0x14A, 11.4f);
func_8028A010(ASSET_14A_ANIM_BANJO_LISTENING, 11.4f);
} else if (func_80298850() == 0) {
sp20 = TRUE;
}
}
break;
case 0x14A:
case ASSET_14A_ANIM_BANJO_LISTENING:
if (func_80298850() == 0) {
animctrl_reset(anim_ctrl);
animctrl_setDirection(anim_ctrl, 0);

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

@@ -20,7 +20,7 @@ void func_802B4570(void) {
void bssplat_init(void){
s32 sp1C;
func_8028A274(0x149, 1.1f);
func_8028A274(ASSET_149_ANIM_BSSPLAT, 1.1f);
func_8029C7F4(1,1,3,3);
func_802931DC(&sp1C);
func_803463D4(ITEM_14_HEALTH, -sp1C);

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

@@ -249,14 +249,14 @@ void bsstand_update(void) {
func_8029E070(1);
func_802900FC();
} else if (sp18 & 8) {
if (animctrl_getIndex(anim_ctrl) == 0x6F) {
if (animctrl_getIndex(anim_ctrl) == ASSET_6F_ANIM_BSSTAND_IDLE) {
sp1C = animctrl_getAnimTimer(anim_ctrl);
} else {
sp1C = 0.0f;
func_802900B4();
}
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0x6F);
animctrl_setIndex(anim_ctrl, ASSET_6F_ANIM_BSSTAND_IDLE);
animctrl_setDuration(anim_ctrl, 5.5f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);
func_8028774C(anim_ctrl, sp1C);

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

@@ -11,7 +11,7 @@ void func_802B5FD0(void) {
anim_ctrl = _player_getAnimCtrlPtr();
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0x69);
animctrl_setIndex(anim_ctrl, ASSET_69_ANIM_BSSURF);
animctrl_setDuration(anim_ctrl, 1.8f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);
_func_802875AC(anim_ctrl, "bssurf.c", 0x33);

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

@@ -122,15 +122,15 @@ void func_802B5774(void) {
}
func_80295328(4, 0.7f);
}
if ((animctrl_getIndex(anim_ctrl) == 0x57) && (prev_state != BS_4C_LANDING_IN_WATER)) {
if ((animctrl_getIndex(anim_ctrl) == ASSET_57_ANIM_BSSWIM_IDLE) && (prev_state != BS_4C_LANDING_IN_WATER)) {
animctrl_setSmoothTransition(anim_ctrl, 0);
animctrl_setIndex(anim_ctrl, 0x57);
animctrl_setIndex(anim_ctrl, ASSET_57_ANIM_BSSWIM_IDLE);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);
animctrl_setDuration(anim_ctrl, 1.2f);
} else {
animctrl_reset(anim_ctrl);
animctrl_setTransitionDuration(anim_ctrl, transition_duration);
animctrl_setIndex(anim_ctrl, 0x57);
animctrl_setIndex(anim_ctrl, ASSET_57_ANIM_BSSWIM_IDLE);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);
func_8028774C(anim_ctrl, 0.3f);
animctrl_setDuration(anim_ctrl, 1.2f);
@@ -196,9 +196,9 @@ void func_802B5B18(void) {
} else {
anim_duration = 0.4f;
}
if (animctrl_getIndex(anim_ctrl) != 0x39) {
if (animctrl_getIndex(anim_ctrl) != ASSET_39_ANIM_BSSWIM_SWIM) {
animctrl_reset(anim_ctrl);
animctrl_setIndex(anim_ctrl, 0x39);
animctrl_setIndex(anim_ctrl, ASSET_39_ANIM_BSSWIM_SWIM);
animctrl_setTransitionDuration(anim_ctrl, anim_duration);
func_8028774C(anim_ctrl, 0.8f);
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_LOOP);

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

@@ -12,7 +12,7 @@ void bsthrow_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x11b);
animctrl_setIndex(aCtrl, ASSET_11B_ANIM_BSTHROW);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsthrow.c", 0x2e);

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

@@ -199,7 +199,7 @@ void bswalk_slow_init(void){
sp20 = 0.0f;
}
animctrl_reset(s0);
animctrl_setIndex(s0, ASSET_3_ANIM_BANJO_WALK);
animctrl_setIndex(s0, ASSET_3_ANIM_BSWALK);
animctrl_setDuration(s0, 0.43f);
func_8028774C(s0, sp20);
animctrl_setPlaybackType(s0, ANIMCTRL_LOOP);

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

@@ -140,7 +140,7 @@ int bswalrus_inSet(enum bs_e state){
}
void bswalrus_idle_init(void){
func_8028A010(0x11f, 4.0f);
func_8028A010(ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
@@ -178,7 +178,7 @@ void bswalrus_idle_end(void){
}
void bswalrus_walk_init(void){
func_8028A010(0x120, 0.8f);
func_8028A010(ASSET_120_ANIM_BSWALRUS_WALK, 0.8f);
func_8029C7F4(2,1,1,2);
func_80289EC8(D_80364DC0, D_80364DC4, D_80364DC8, D_80364DCC);
func_802900B4();
@@ -214,7 +214,7 @@ void bswalrus_jump_init(void){
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, 0x121);
animctrl_setIndex(aCtrl, ASSET_121_ANIM_BSWALRUS_JUMP);
animctrl_setSubRange(aCtrl, 0.0f, 0.514f);
animctrl_setDuration(aCtrl, 1.0f);
func_8028774C(aCtrl, 0.1);
@@ -304,7 +304,7 @@ void bswalrus_jump_end(void){
void bswalrus_fall_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x121);
animctrl_setIndex(aCtrl, ASSET_121_ANIM_BSWALRUS_JUMP);
func_8028774C(aCtrl, 0.662f);
animctrl_setDuration(aCtrl, 0.7f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
@@ -443,7 +443,7 @@ void bswalrus_die_init(void){
func_8029B930();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, 0x19d);
animctrl_setIndex(aCtrl, ASSET_19D_ANIM_BSWALRUS_DIE);
animctrl_setSubRange(aCtrl, 0.0f, 0.4454f);
animctrl_setDuration(aCtrl, 2.2f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
@@ -529,7 +529,7 @@ void bswalrus_drone_end(void){
}
void func_802B90D0(void){
func_8028A010(0x19e, 0.8f);
func_8028A010(ASSET_19E_ANIM_BSWALRUS_SLED, 0.8f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_8029C674();
@@ -554,7 +554,7 @@ void func_802B917C(void){
}
void bswalrus_sled_init(void){
func_8028A010(0x19e, 0.8f);
func_8028A010(ASSET_19E_ANIM_BSWALRUS_SLED, 0.8f);
func_8029C7F4(2,1,1,2);
func_80289EC8(D_80364DC0, D_80364DC4, D_80364DE0, D_80364DE4);
func_802900B4();
@@ -595,7 +595,7 @@ void bswalrus_sled_jump_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setSmoothTransition(aCtrl, FALSE);
animctrl_setIndex(aCtrl, 0x19f);
animctrl_setIndex(aCtrl, ASSET_19F_ANIM_BSWALRUS_SLED_JUMP);
animctrl_setSubRange(aCtrl, 0.0f, 0.4285f);
animctrl_setDuration(aCtrl, 1.0f);
func_8028774C(aCtrl, 0.14f);
@@ -664,7 +664,7 @@ void bswalrus_sled_jump_end(void){
void func_802B95A0(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x19f);
animctrl_setIndex(aCtrl, ASSET_19F_ANIM_BSWALRUS_SLED_JUMP);
animctrl_setSubRange(aCtrl, 0.0f, 0.5058f);
animctrl_setDuration(aCtrl, 1.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);

4
src/core2/code_14420.c
View File

@@ -63,13 +63,13 @@ Struct_core2_13FC0 D_80364650[14] = {
{BS_95_WALRUS_DRONE, ASSET_120_ANIM_BSWALRUS_WALK, 0.7f},
{BS_96_SWIM_LOCKED, ASSET_39_ANIM_BSSWIM_SWIM, 0.8f},
{BS_97_DIVE_LOCKED, ASSET_71_ANIM_BANJO_BSDIVE_SWIM_SLOW, 0.75f},
{BS_98_WALK_DRONE, ASSET_3_ANIM_BANJO_WALK, 0.43f},
{BS_98_WALK_DRONE, ASSET_3_ANIM_BSWALK, 0.43f},
{BS_99_BFLY_DRONE, ASSET_38_BANJO_FLY, 0.62f},
{BS_9A_BTROT_DRONE, ANIM_15_ANIM_BTROT_WALK, 0.53f},
{BS_9B_LONGLEG_DRONE, ASSET_42_ANIM_BSLONGLEG_WALK, 0.8f},
{BS_9C_WALRUS_SLED_DRONE, ASSET_19E_ANIM_BSWALRUS_SLED, 0.8f},
{BS_9D_BEE_DRONE, ASSET_1DC_ANIM_BEE_FLY, 0.38f},
{BS_98_WALK_DRONE, ASSET_3_ANIM_BANJO_WALK, 0.43f},
{BS_98_WALK_DRONE, ASSET_3_ANIM_BSWALK, 0.43f},
{BS_A4_WONDERWING_DRONE, ASSET_11_ANIM_BSWONDERWING_WALK, 0.53f}
};

3
src/core2/code_6AEF0.c
View File

@@ -3,7 +3,6 @@
#include "variables.h"
s32 D_80368AA0[3] = {0xC8, 0xC8, 0xE6};
/* .bss */
u8 D_80380A00;
@@ -19,6 +18,8 @@ void func_802F1EA4(void){
}
ParticleEmitter *func_802F1EC8(f32 *position) {
static s32 D_80368AA0[3] = {0xC8, 0xC8, 0xE6};
ParticleEmitter *p_emitter;
p_emitter = func_802F0EF0(D_80380A00);

14
src/core2/code_E910.c
View File

@@ -75,13 +75,13 @@ bsMap D_80363824[] ={
{BS_44_JIG_JIGGY, bsjig_jiggy_init, bsjig_jiggy_update, bsjig_jiggy_end, bsjig_jiggy_interrupt},
{BS_45_BTROT_SLIDE, bsbtrot_slide_init, bsbtrot_slide_update, bsbtrot_slide_end, func_802B5350},
{0x46, func_802A2098, func_802A2130, func_802A2054, func_80296590},
{BS_48_PUMPKIN_IDLE, func_802B2384, func_802B242C, func_802B24AC, func_802B5350},
{BS_49_PUMPKIN_WALK, func_802B24D4, func_802B2580, func_802B2610, func_802B5350},
{BS_4A_PUMPKIN_JUMP, func_802B2638, func_802B2750, func_802B2990, func_802B5350},
{BS_4B_PUMPKIN_FALL, func_802B29C0, func_802B2A5C, func_802B2BD0, func_802B5350},
{BS_48_PUMPKIN_IDLE, bspumpkin_idle_init, bspumpkin_idle_update, bspumpkin_idle_end, func_802B5350},
{BS_49_PUMPKIN_WALK, bspumpkin_walk_init, bspumpkin_walk_update, bspumpkin_walk_end, func_802B5350},
{BS_4A_PUMPKIN_JUMP, bspumpkin_jump_init, bspumpkin_jump_update, bspumpkin_jump_end, func_802B5350},
{BS_4B_PUMPKIN_FALL, bspumpkin_fall_init, bspumpkin_fall_update, bspumpkin_fall_end, func_802B5350},
{BS_4C_LANDING_IN_WATER, func_802A846C, func_802A85EC, func_802A872C, func_80296608},
{BS_4D_PUMPKIN_OW, func_802B2FDC, func_802B2FFC, func_802B301C, func_80296590},
{BS_4E_PUMPKIN_DIE, func_802B309C, func_802B3240, func_802B3448, func_80296590},
{BS_4D_PUMPKIN_OW, __bspumpkin_ow_init, __bspumpkin_ow_update, __bspumpkin_ow_end, func_80296590},
{BS_4E_PUMPKIN_DIE, bspumpkin_die_init, bspumpkin_die_update, bspumpkin_die_end, func_80296590},
{BS_4F_CLIMB_IDLE, bsclimb_idle_init, bsclimb_idle_update, bsclimb_idle_end, func_802ABD60},
{BS_50_CLIMB_MOVE, bsclimb_move_init, bsclimb_move_update, bsclimb_move_end, func_802ABD60},
{BS_51_CLIMB_EXIT, func_802B1928, func_802B1A54, func_802B1BCC, func_80296608},
@@ -155,7 +155,7 @@ bsMap D_80363824[] ={
{BS_9D_BEE_DRONE, bsbee_drone_init, bsbee_drone_update, bsbee_drone_end, bsdrone_interrupt},
{0x0000009E, func_802ABCCC, func_802ABD0C, func_802ABD40, func_802ABD60},
{BS_ANT_BOUNCE, bsant_bounce_init, bsant_bounce_update, bsant_bounce_end, func_80296590},
{BS_PUMPKIN_BOUNCE, func_802B303C, func_802B305C, func_802B307C, func_80296590},
{BS_PUMPKIN_BOUNCE, bspumpkin_rebound_init, bspumpkin_rebound_update, bspumpkin_rebound_end, func_80296590},
{BS_CROC_BOUNCE, bscroc_bounce_init, bscroc_bounce_update, bscroc_bounce_end, func_80296590},
{BS_WALRUS_BOUNCE, bswalrus_bounce_init, bswalrus_bounce_update, bswalrus_bounce_end, func_80296590},
{BS_BEE_BOUNCE, func_802A1BC8, func_802A1BE8, func_802A1C08, func_80296590},