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

label TTC actors

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-31 13:47:47 -06:00
parent 0be5904e28
commit e05358d82f
36 changed files with 208 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/yaw.h"
void func_80293D48(f32,f32);
@@ -77,7 +78,7 @@ int bsant_inSet(s32 move_indx){
void bsant_idle_init(void){
func_8029E554();
func_8028A010(ASSET_5E_ANIM_BSANT_IDLE, 1.2f);
func_8029C7F4(1,1,1,2);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,1,2);
func_80297970(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
@@ -113,7 +114,7 @@ void bsant_idle_end(void){
void bsant_walk_init(void){
func_8029E554();
func_8028A010(ASSET_5F_ANIM_BSANT_WALK, 0.8f);
func_8029C7F4(2,1,1,2);
func_8029C7F4(2,YAW_STATE_1_DEFAULT,1,2);
func_80289EC8(D_80364960, D_80364964, D_80364968, D_8036496C);
func_802900B4();
}
@@ -159,7 +160,7 @@ void bsant_jump_init(void){
animctrl_setSubRange(aCtrl, 0.0f, 0.4423f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsant.c", 0x17c);
func_8029C7F4(1,1,3,6);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,3,6);
if(func_8029B2E8() != 0.0f)
yaw_setIdeal(func_8029B33C());
func_8029797C(yaw_getIdeal());
@@ -237,7 +238,7 @@ void bsant_fall_init(void){
func_8028774C(aCtrl, 0.4423f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_STOPPED);
func_802875AC(aCtrl, "bsant.c", 0x208);
func_8029C7F4(1,1,3,6);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,3,6);
D_8037D294 = 0;
}
@@ -301,7 +302,7 @@ static void __bsant_recoil_init(int take_damage){
func_80297970(200.0f);
func_8029797C(sp38);
func_802979AC(sp38, func_80297A64());
func_8029C7F4(1,1,2,3);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,2,3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
baMarker_collisionOff();
@@ -388,7 +389,7 @@ void bsant_die_init(void){
func_80297970(D_8037D290);
func_8029797C(sp38);
func_802979AC(sp38, func_80297A64());
func_8029C7F4(1,1,2,3);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,2,3);
player_setYVelocity(510.0f);
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
@@ -448,7 +449,7 @@ void bsant_die_end(void){
void func_8029F398(void){
func_8029E554();
func_8028A010(ASSET_5E_ANIM_BSANT_IDLE, 2.0f);
func_8029C7F4(1,1,3,2);
func_8029C7F4(1,YAW_STATE_1_DEFAULT,3,2);
func_80297970(0.0f);
func_8029C674();
func_802B3A50();

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

@@ -10,7 +10,7 @@ u8 D_8037D2E1;
void bseggass_init(void){
func_8028A274(ASSET_2B_ANIM_BSEGGASS, 1.0f);
func_8029C7F4(1,3,1,3);
func_80299234(350.0f, 14.0f);
yaw_setVelocityBounded(350.0f, 14.0f);
func_80297970(0.0f);
func_8029E058(1);
D_8037D2E0 = (D_8037D2E1 = 1);

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

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
void func_80299234(f32, f32);
void yaw_setVelocityBounded(f32, f32);
void func_802875AC(AnimCtrl *, char*, s32);
/* .bss */
@@ -13,7 +13,7 @@ u8 D_8037D2F1;
void bsegghead_init(void){
func_8028A274(ASSET_2A_ANIM_BSEGGHEAD, 1.0f);
func_8029C7F4(1,3,1,3);
func_80299234(350.0f, 14.0f);
yaw_setVelocityBounded(350.0f, 14.0f);
func_80297970(0.0f);
func_8029E070(1);
D_8037D2F0 = (D_8037D2F1 = 1);

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

@@ -73,12 +73,12 @@ void bsbflip_update(void){
case 0://L802A2FD4
if(animctrl_isAt(aCtrl, 0.1837f)){
if(func_8029B2E8() != 0.0f){
func_802991A8(2);
yaw_setUpdateState(2);
func_8029957C(3);
if(func_8029B2E8){ //!!! BUG !!!
yaw_setIdeal(func_8029B33C());
}
func_80299254(1.0f);
yaw_rotateTimed(1.0f);
func_802978DC(6);
func_8029797C(yaw_getIdeal());
func_80297970(200.0f);

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

@@ -48,8 +48,8 @@ void func_802A3404(void){
void func_802A3430(void){
baModel_setYDisplacement(60.0f);
func_802991A8(3);
func_80299234(500.0f, 2.0f);
yaw_setUpdateState(3);
yaw_setVelocityBounded(500.0f, 2.0f);
roll_setAngularVelocity(500.0f, 2.0f);
func_802A33D8();
func_80293D48(60.0f, 45.0f);
@@ -65,7 +65,7 @@ void func_802A34C8(void){
func_8029E070(0);
baModel_setYDisplacement(0.0f);
func_8029CB84();
func_802991A8(1);
yaw_setUpdateState(1);
func_80291548();
func_80293D74();
func_80294378(1);
@@ -80,12 +80,12 @@ void func_802A354C(void){
sp2C = func_8029B2D0();
if(button_held(BUTTON_R)){
func_80299234(500.0f, 30.0f);
yaw_setVelocityBounded(500.0f, 30.0f);
yaw_range = 6.0f;
roll_range = 85.0f;
}
else{
func_80299234(500.0f, 2.0f);
yaw_setVelocityBounded(500.0f, 2.0f);
yaw_range = 3.0f;
roll_range = 75.0f;
}

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

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/yaw.h"
void baModel_80292048(s32, f32, f32, f32);
void func_802875AC(AnimCtrl *, char *, s32);
@@ -37,8 +38,8 @@ void bsbpeck_init(void){
func_80293240(2);
func_8028A274(ASSET_1A_ANIM_BSBPECK, 0.2f);
func_8029C7F4(1,3,1,6);
func_80299234(1200.0f, 10.0f);
func_8029C7F4(1,YAW_STATE_3_BOUNDED, 1, 6);
yaw_setVelocityBounded(1200.0f, 10.0f);
func_8029E070(1);
gravity_set(D_80364A60);
player_setYVelocity(D_80364A64);

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

@@ -37,11 +37,11 @@ void func_802A71D8(void) {
if (button_held(BUTTON_R)) {
roll_range = 45.0f;
yaw_range = 4.3f;
func_80299234(250.0f, 20.0f);
yaw_setVelocityBounded(250.0f, 20.0f);
} else {
roll_range = 35.0f;
yaw_range = ml_interpolate_f(sp38, 3.1f, 2.4f);
func_80299234(90.0f, ml_interpolate_f(sp38, 3.8f, 2.2f));
yaw_setVelocityBounded(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)));
@@ -332,7 +332,7 @@ void func_802A7DAC(void) {
ability_use(ABILITY_3_CAMERA_CONTROL);
func_8028A180(0x3C, 1.0f);
func_802A7140();
func_80299234(500.0f, 5.0f);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297930(0);
func_802A744C();
pitch_setAngVel(200.0f, 2.5f);

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

@@ -351,7 +351,7 @@ void bsbtrot_jump_init(void){
func_802875AC(aCtrl, "bsbtrot.c", 0x272);
func_802A8A40();
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_802978DC(6);
if(func_8029B2E8() != 0.0f)

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

@@ -11,7 +11,7 @@ void func_80297970(f32);
void baModel_setYDisplacement(f32);
void func_80297BF8(f32);
void func_802BFE50(f32, f32, f32);
void func_80299234(f32, f32);
void yaw_setVelocityBounded(f32, f32);
f32 func_8029B2D0(void);
f32 func_8029B2DC(void);
f32 func_80297A64(void);
@@ -108,7 +108,7 @@ void func_802A07F8(void){
if(bsBeeFly_inSet(bs_getPrevState()))
return;
baModel_setYDisplacement(65.0f);
func_802991A8(3);
yaw_setUpdateState(3);
roll_setAngularVelocity(500.0f, 2.0f);
func_802A0724();
gravity_set(-300.0f);
@@ -125,12 +125,12 @@ void _bsBeeFly_updateYaw(void){
stickX = func_8029B2D0();
func_802BFE50(2.0f, 2000.0f, 350.0f);
if(button_held(BUTTON_R)){
func_80299234(500.0f, 30.0f);
yaw_setVelocityBounded(500.0f, 30.0f);
sp34 = 6.0f;
sp30 = 85.0f;
}
else{
func_80299234(500.0f, 2.0f);
yaw_setVelocityBounded(500.0f, 2.0f);
sp34 = 3.0f;
sp30 = 65.0f;
}

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

@@ -18,7 +18,7 @@ void func_802AB5C0(void){
f2 = 0.0f;
}
else{
f2 = func_80257D30(sp28, 0.03f, 1.0f, 100.0f, 300.0f);
f2 = ml_mapRange_f(sp28, 0.03f, 1.0f, 100.0f, 300.0f);
}
sp2C[0] = 0.0f;
sp2C[1] = f2;
@@ -28,8 +28,8 @@ void func_802AB5C0(void){
void func_802AB654(void){
func_8029957C(6);
func_802991A8(3);
func_80299234(500.0f, 15.0f);
yaw_setUpdateState(3);
yaw_setVelocityBounded(500.0f, 15.0f);
func_8029B324(0, 0.03f);
func_8029B324(1, 1.0f);
func_802978DC(0xA);

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

@@ -57,8 +57,8 @@ void bscrouch_init(void){
func_8028774C(aCtrl, sp24);
func_802875AC(aCtrl, "bscrouch.c", 0xa0);
func_80289F10(1);
func_802991A8(3);
func_80299234(350.0f, 14.0f);
yaw_setUpdateState(3);
yaw_setVelocityBounded(350.0f, 14.0f);
func_8029957C(7);
func_8029932C(8.0f);
func_802978DC(3);

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

@@ -44,7 +44,7 @@ void bsdie_init(void){
func_8029797C(sp38);
func_802979AC(sp38, func_80297A64());
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(2);
func_802978DC(3);
player_setYVelocity(510.0f);

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

@@ -261,7 +261,7 @@ void func_802B1928(void) {
animctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
func_802875AC(anim_ctrl, "bsjump.c", 0x201);
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_802978DC(3);
func_8029797C(yaw_getIdeal());
@@ -342,7 +342,7 @@ void func_802B1BF4(void) {
func_802875AC(anim_ctrl, "bsjump.c", 0x298);
yaw_setIdeal(func_8029B41C());
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_802978DC(6);
func_80297970(0.0f);

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

@@ -4,7 +4,7 @@
#include "bsint.h"
extern f32 func_8029B2E8(void);
void func_80299234(f32, f32);
void yaw_setVelocityBounded(f32, f32);
void func_802875AC(AnimCtrl *, char*, s32);
@@ -189,14 +189,14 @@ void bsstand_update(void) {
anim_ctrl = _player_getAnimCtrlPtr();
if ((func_8029B300() == 0) && (func_8029B2E8() > 0.0f)) {
D_8037D544 = 1;
func_802991A8(3);
func_80299234(200.0f, 14.0f);
yaw_setUpdateState(3);
yaw_setVelocityBounded(200.0f, 14.0f);
} else {
if (D_8037D544 != 0) {
yaw_setIdeal(yaw_get());
}
D_8037D544 = 0;
func_802991A8(1);
yaw_setUpdateState(1);
}
next_state = func_802B488C(0);
sp18 = D_80364D20[D_8037D540];

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

@@ -12,14 +12,14 @@ f32 D_80364D44 = 300.0f;
f32 D_80364D48 = 1.2f;
f32 D_80364D4C = 0.7f;
s16 D_80364D50[10] = {
0x57,
0x57,
0x57,
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
0x57,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
0x57,
0x57,
ASSET_57_ANIM_BSSWIM_IDLE,
ASSET_57_ANIM_BSSWIM_IDLE,
0x58,
0x58
};
@@ -137,7 +137,7 @@ void func_802B5774(void) {
func_802875AC(anim_ctrl, "bsswim.c", 0xFD);
}
func_8029C7F4(1, 3, 3, 2);
func_80299234(500.0f, 5.0f);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
func_802B563C();
D_8037D550 = 0;
@@ -207,8 +207,8 @@ void func_802B5B18(void) {
func_80289F10(2);
func_80289EA8(0.3f, 1.5f);
func_80289EC8(D_80364D40, D_80364D44, D_80364D48, D_80364D4C);
func_802991A8(3);
func_80299234(500.0f, 5.0f);
yaw_setUpdateState(3);
yaw_setVelocityBounded(500.0f, 5.0f);
func_8029957C(1);
func_802978DC(2);
}
@@ -279,7 +279,7 @@ void func_802B5E30(void) {
void func_802B5E8C(void) {
func_8028A010(0x57, 1.2f);
func_8029C7F4(1, 3, 3, 2);
func_80299234(500.0f, 5.0f);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
func_802B563C();
func_802B5E30();

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

@@ -22,7 +22,7 @@ void bstalk_init(void){
func_80257F18(plyr_pos, target_pos, &yaw);
yaw_setIdeal(yaw);
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_802978DC(2);
func_80297970(0.0f);

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

@@ -18,7 +18,7 @@ void bsthrow_init(void){
func_802875AC(aCtrl, "bsthrow.c", 0x2e);
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_802978DC(3);
func_80297970(0.0f);

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

@@ -18,7 +18,7 @@ void bsturn_init(void){
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bsturn.c", 0x37);
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(2);
func_802978DC(3);
_get_velocity(&sp28);

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

@@ -22,7 +22,7 @@ void bstwirl_init(void){
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_802875AC(aCtrl, "bstwirl.c", 0x46);
func_80289F10(1);
func_802991A8(1);
yaw_setUpdateState(1);
func_8029957C(3);
func_8029797C(yaw_getIdeal());
func_802979AC(yaw_getIdeal(), func_80297A64());