core2 .data defininitions

This commit is contained in:
Banjo Kazooie
2022-08-10 16:06:32 -05:00
parent e651f96508
commit bd0dfb3ea5
23 changed files with 486 additions and 117 deletions

View File

@@ -71,12 +71,12 @@ int bsant_inSet(s32 move_indx){
|| (move_indx == BS_3E_ANT_OW)
|| (move_indx == BS_43_ANT_DIE)
|| (move_indx == 0x8e)
|| (move_indx == BS_ANT_DRONE);
|| (move_indx == BS_92_ANT_DRONE);
}
void bsant_idle_init(void){
func_8029E554();
func_8028A010(ANIM_TERMITE_IDLE, 1.2f);
func_8028A010(ASSET_5E_ANIM_BSANT_IDLE, 1.2f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
@@ -112,7 +112,7 @@ void bsant_idle_end(void){
void bsant_walk_init(void){
func_8029E554();
func_8028A010(ANIM_TERMITE_WALK, 0.8f);
func_8028A010(ASSET_5F_ANIM_BSANT_WALK, 0.8f);
func_8029C7F4(2,1,1,2);
func_80289EC8(D_80364960, D_80364964, D_80364968, D_8036496C);
func_802900B4();
@@ -447,7 +447,7 @@ void bsant_die_end(void){
void func_8029F398(void){
func_8029E554();
func_8028A010(ANIM_TERMITE_IDLE, 2.0f);
func_8028A010(ASSET_5E_ANIM_BSANT_IDLE, 2.0f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_8029C674();

View File

@@ -123,9 +123,9 @@ int bsbfly_inSet(enum bs_e arg0){
|| arg0 == BS_18_FLY_KNOCKBACK
|| arg0 == BS_59_BFLY_UNK59
|| arg0 == BS_FLY_OW
|| arg0 == BS_BFLY_UNK76
|| arg0 == BS_76_BFLY_LOCKED
|| arg0 == BS_24_FLY
|| arg0 == BS_BFLY_UNK99;
|| arg0 == BS_99_BFLY_DRONE;
}
int func_802A37F8(void){
@@ -177,7 +177,7 @@ void bsbfly_enter_end(void){
}
void bsbfly_init(void){
func_8028A010(ANIM_BANJO_FLY, 0.62f);
func_8028A010(ASSET_38_BANJO_FLY, 0.62f);
func_8029C7F4(1,1,3,3);
if(miscflag_isTrue(9)){
func_80297970(0.0f);
@@ -754,7 +754,7 @@ void func_802A4F44(void){
}
void func_802A4F74(void) {
func_8028A010(ANIM_BANJO_FLY, 0.62f);
func_8028A010(ASSET_38_BANJO_FLY, 0.62f);
func_8029C7F4(1, 1, 3, 7);
func_8029E070(1);
func_802914CC(4);

View File

@@ -46,8 +46,8 @@ int bslongleg_inSet(s32 move_indx){
|| (move_indx == BS_LONGLEG_JUMP)
|| (move_indx == BS_LONGLEG_EXIT)
|| (move_indx == BS_LONGLEG_SLIDE)
|| (move_indx == BS_LONGLEG_DRONE)
|| (move_indx == BS_LONGLEG_UNK62);
|| (move_indx == BS_9B_LONGLEG_DRONE)
|| (move_indx == BS_62_LONGLEG_LOCKED);
}
void func_802A531C(void){
@@ -151,7 +151,7 @@ void bsblongleg_enter_end(void){
}
void bsblongleg_stand_enter(void){
func_8028A010(ANIM_BANJO_LONGLEG_IDLE, 1.0f);
func_8028A010(ASSET_41_ANIM_BSLONGLEG_IDLE, 1.0f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
func_80292090(2);
@@ -195,7 +195,7 @@ void bsblongleg_walk_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_LONGLEG_WALK);
animctrl_setIndex(aCtrl, ASSET_42_ANIM_BSLONGLEG_WALK);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_LOOP);
func_802875AC(aCtrl, "bsblongleg.c", 0x1a1);
func_8029C7F4(2,1,1,2);
@@ -458,7 +458,7 @@ void func_802A6388(f32 arg0){
}
void func_802A6394(void){
func_8028A010(ANIM_BANJO_LONGLEG_IDLE, 1.0f);
func_8028A010(ASSET_41_ANIM_BSLONGLEG_IDLE, 1.0f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A5374();

View File

@@ -86,7 +86,7 @@ bool bsbswim_inSet(enum bs_e move_id){
|| move_id == BS_2C_DIVE_B
|| move_id == BS_39_DIVE_A
|| move_id == BS_30_DIVE_ENTER
|| move_id == BS_78
|| move_id == BS_78_DIVE_LOCKED
|| move_id == BS_7F_DIVE_OW
|| move_id == BS_54_SWIM_DIE
|| move_id == BS_97_DIVE_LOCKED

View File

@@ -238,7 +238,7 @@ void bsbtrot_enter_end(void){
}
void bsbtrot_stand_init(void){
func_8028A010(ANIM_BANJO_BTROT_IDLE, 1.2f);
func_8028A010(ASSET_26_ANIM_BTROT_IDLE, 1.2f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
func_802A8A40();
@@ -675,7 +675,7 @@ void bsbtrot_fall_end(void){
}
void bsbtrot_unk79_init(void){
func_8028A010(ANIM_BANJO_BTROT_IDLE, 1.2f);
func_8028A010(ASSET_26_ANIM_BTROT_IDLE, 1.2f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_802A8A40();

View File

@@ -104,7 +104,7 @@ void bsbwhirl_enter_end(void){
}
void bsbwhirl_stand_init(void){
func_8028A010(ANIM_BANJO_WONDERWING_IDLE, 1.0f);
func_8028A010(ASSET_23_ANIM_BSWONDERWING_IDLE, 1.0f);
func_8029C7F4(1,1,1,2);
func_80297970(0.0f);
}
@@ -130,7 +130,7 @@ void bsbwhirl_stand_end(void){
}
void bsbwhirl_walk_init(void){
func_8028A010(ANIM_BANJO_WONDERWING_WALK, 0.53f);
func_8028A010(ASSET_11_ANIM_BSWONDERWING_WALK, 0.53f);
func_80289EC8(D_80364AD0, D_80364AD4, D_80364AD8, D_80364ADC);
func_8029C7F4(2,1,1,2);
@@ -282,7 +282,7 @@ void bsbwhirl_drone_end(void){
}
void func_802AADBC(void){
func_8028A010(ANIM_BANJO_WONDERWING_IDLE, 1.0f);
func_8028A010(ASSET_23_ANIM_BSWONDERWING_IDLE, 1.0f);
func_8029C7F4(1,1,3,2);
func_80297970(0.0f);
func_8029C674();

View File

@@ -77,7 +77,7 @@ void bsclimb_idle_init(void){
yaw_applyIdeal();
}
ability_use(4);
func_8028A010(ASSET_B2_ANIM_BANJO_CLIMB_IDLE_2, 2.64f);
func_8028A010(ASSET_B2_ANIM_BSCLIMB_IDLE_2, 2.64f);
func_80289F10(1);
func_802AB654();
@@ -94,13 +94,13 @@ void bsclimb_idle_update(void){
case 0:
D_8037D3D4 -= time_getDelta();
if(D_8037D3D4 <= 0.0f){
func_8028A180(ASSET_B1_ANIM_BANJO_CLIMB_IDLE_1, 2.96f);
func_8028A180(ASSET_B1_ANIM_BSCLIMB_IDLE_1, 2.96f);
D_8037D3D0 = 1;
}
break;
case 1:
if(animctrl_isStopped(anim_ctrl)){
func_8028A010(ASSET_B2_ANIM_BANJO_CLIMB_IDLE_2, 2.64f);
func_8028A010(ASSET_B2_ANIM_BSCLIMB_IDLE_2, 2.64f);
func_802AB750(3.0f, 4.0f);
D_8037D3D0 = 0;
}
@@ -190,7 +190,7 @@ void bsclimb_move_end(void){
//bsclimb_unknown_9E_init
void func_802ABCCC(void){
func_8028A010(ASSET_B2_ANIM_BANJO_CLIMB_IDLE_2, 2.64f);
func_8028A010(ASSET_B2_ANIM_BSCLIMB_IDLE_2, 2.64f);
func_80289F10(1);
func_802AB654();
func_802978DC(7);

View File

@@ -96,8 +96,8 @@ int bscroc_inSet(enum bs_e state){
|| state == BS_6E_CROC_BITE
|| state == BS_CROC_EAT_BAD
|| state == BS_70_CROC_EAT_GOOD
|| state == BS_CROC_LOCKED
|| state == BS_CROC_DRONE;
|| state == BS_8D_CROC_LOCKED
|| state == BS_94_CROC_DRONE;
}
void bscroc_idle_init(void){

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) == ANIM_BANJO_WALK
&& animctrl_getIndex(aCtrl) == ASSET_3_ANIM_BANJO_WALK
){
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ANIM_BANJO_RUN);

View File

@@ -100,7 +100,7 @@ void func_802B3D1C(void) {
next_state = 0;
if (player_inWater() != 0) {
next_state = BS_77;
next_state = BS_77_SWIM_LOCKED;
}
if (func_802B3BB0() != 0) {
next_state = bs_getIdleState();
@@ -126,7 +126,7 @@ void func_802B3DBC(void) {
next_state = 0;
if (player_inWater() != 0) {
next_state = BS_77;
next_state = BS_77_SWIM_LOCKED;
}
if (func_802B3BB0() != 0) {
next_state = bs_getIdleState();
@@ -154,7 +154,7 @@ void func_802B3E64(void) {
next_state = 0;
func_8029C6D0();
if (player_inWater()) {
next_state = BS_77;
next_state = BS_77_SWIM_LOCKED;
}
if (func_802B3BB0()) {
next_state = bs_getIdleState();

View File

@@ -97,7 +97,7 @@ bool bsswim_inset(enum bs_e state_id){
return state_id == BS_2D_SWIM_IDLE
|| state_id == BS_2E_SWIM
|| state_id == BS_4C_LANDING_IN_WATER
|| state_id == BS_77
|| state_id == BS_77_SWIM_LOCKED
|| state_id == BS_96_SWIM_LOCKED
;
}

View File

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

View File

@@ -125,7 +125,7 @@ int func_802B8190(enum bs_e state){
|| state == BS_7E_WALRUS_SLED
|| state == 0x82
|| state == 0x80
|| state == BS_7D_WALRUS_SLED_DRONE;
|| state == BS_9C_WALRUS_SLED_DRONE;
}
int func_802B81F0(enum bs_e state){
@@ -135,7 +135,7 @@ int func_802B81F0(enum bs_e state){
|| state == BS_6A_WALRUS_FALL
|| state == BS_WALRUS_OW
|| state == BS_WALRUS_DIE
|| state == BS_WALRUS_DRONE
|| state == BS_95_WALRUS_DRONE
|| func_802B8190(state);
}