identified/labeled camera functions

This commit is contained in:
Banjo Kazooie
2023-03-10 21:52:35 -06:00
parent 13728811aa
commit 7f3dd5aa12
164 changed files with 1583 additions and 1522 deletions

View File

@@ -395,7 +395,7 @@ void bsant_die_init(void){
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xd);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
D_8037D294 = 0;
baMarker_collisionOff();

View File

@@ -5,7 +5,7 @@
extern void func_8028FDC8(f32);
extern void baModel_setYDisplacement(f32);
extern f32 func_8029B2D0(void);
extern void func_802BFE50(f32, f32, f32);
extern void ncDynamicCam4_func_802BFE50(f32, f32, f32);
extern void func_80354030(f32[3], f32);
@@ -35,7 +35,7 @@ int func_802A3350(void){
void func_802A339C(f32 arg0[3], f32 arg1[3], f32 arg2){
func_8024C5A8(arg0);
ml_vec3f_scale(arg0, arg2);
func_8024C764(arg1);
viewport_getRotation(arg1);
}
void func_802A33D8(void){
@@ -330,7 +330,7 @@ void func_802A3F9C(void){
pitch_setIdeal(sp1C[0]);
func_8029E070(1);
func_802914CC(4);
func_802BFE74(1);
ncDynamicCam4_func_802BFE74(1);
func_802A3430();
FUNC_8030E624(SFX_52_BANJO_YAH_OH, 1.0f, 28000);
D_8037D345 = 0;
@@ -377,7 +377,7 @@ void func_802A411C(void) {
if (animctrl_isAt(sp58, 0.6905f)) {
func_802978DC(8);
func_802914CC(5);
func_802BF590(&D_8037D338);
ncDynamicCam5_func_802BF590(&D_8037D338);
animctrl_setDuration(sp58, 0.05f);
func_80299CF4(SFX_50_KAZOOIE_RRRUH, 1.3f, 0x7FFF);
D_8037D345 = 1;
@@ -573,7 +573,7 @@ void func_802A48B4(void) {
if (item_getCount(ITEM_14_HEALTH) == 0) {
func_8029C984();
func_8029151C(0xD);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029B930();
func_8029E3C0(0, 2.5f);
D_8037D344 = 2;
@@ -652,7 +652,7 @@ void func_802A4A78(s32 arg0) {
func_80297BF8(-4000.0f);
func_8029E070(1);
func_802914CC(4);
func_802BFE50(12.0f, 10000.0f, 800.0f);
ncDynamicCam4_func_802BFE50(12.0f, 10000.0f, 800.0f);
baMarker_collisionOff();
func_802A3430();
}
@@ -728,7 +728,7 @@ void func_802A4D90(void) {
gravity_set(-1800.0f);
baMarker_collisionOff();
func_802914CC(4);
func_802BFE50(12.0f, 10000.0f, 800.0f);
ncDynamicCam4_func_802BFE50(12.0f, 10000.0f, 800.0f);
}
void func_802A4EC8(void) {

View File

@@ -441,7 +441,7 @@ void func_802A8098(void) {
}
if (func_8029E284(1, 1.9f)) {
func_802914CC(0xD);
func_802BF2C0(80.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
if (D_8037D394) {
func_8029E3C0(0, 0.5f);
} else {

View File

@@ -10,7 +10,7 @@ void func_80297970(f32);
void baModel_setYDisplacement(f32);
void func_80297BF8(f32);
void func_802BFE50(f32, f32, f32);
void ncDynamicCam4_func_802BFE50(f32, f32, f32);
void yaw_setVelocityBounded(f32, f32);
f32 func_8029B2D0(void);
f32 func_8029B2DC(void);
@@ -123,7 +123,7 @@ void _bsBeeFly_updateYaw(void){
f32 sp30;
f32 stickX;
stickX = func_8029B2D0();
func_802BFE50(2.0f, 2000.0f, 350.0f);
ncDynamicCam4_func_802BFE50(2.0f, 2000.0f, 350.0f);
if(button_held(BUTTON_R)){
yaw_setVelocityBounded(500.0f, 30.0f);
sp34 = 6.0f;

View File

@@ -9,7 +9,7 @@ void yaw_applyIdeal(void);
void func_8029797C(f32);
f32 func_80297A64(void);
void func_802979AC(f32, f32);
void func_802BF2C0(f32);
void ncDynamicCamD_func_802BF2C0(f32);
f32 baanim_getTimer(void);
void baanim_setEndAndDuration(f32, f32);
@@ -425,7 +425,7 @@ void bsbeemain_die_init(void){
baMarker_collisionOff();
func_80292E48();
func_802914CC(0xd);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
func_8030E58C(SFX_36_BANJO_DOH, 1.8f);
func_8029E3C0(0, 2.9f);

View File

@@ -443,7 +443,7 @@ void bscroc_die_init(void){
baMarker_collisionOff();
func_80292E48();
func_802914CC(0xd);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
func_8030E58C(SFX_36_BANJO_DOH, 1.8f);
func_8029E3C0(0, 2.9f);

View File

@@ -53,7 +53,7 @@ void bsdie_init(void){
pitch_setAngVel(1000.0f, 12.0f);
func_8029E070(1);
func_8029151C(0xd);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
func_8029E3C0(0,2.9f);
D_8037D414 = 0;

View File

@@ -21,14 +21,14 @@ void bsDroneLook_init(void) {
func_8029C7F4(1, 1, 3, 2);
func_80297970(0.0f);
func_80297A0C(0);
func_802BE8D8();
ncDynamicCamera_enterFirstPerson();
__bsDroneLook_getEyePos(eye_position);
func_802C2A64(eye_position);
ncFirstPersonCamera_setZoomedOutPosition(eye_position);
player_getRotation(eye_rotation);
eye_rotation[0] = 0.0f;
eye_rotation[1] += 180.0f;
eye_rotation[2] = 0.0f;
func_802C2A8C(eye_rotation);
ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
miscflag_set(0x17);
}
@@ -41,13 +41,13 @@ void bsDroneLook_update(void) {
next_state = 0;
dt = time_getDelta();
if (func_802C2B00() == 2) {
func_802C2ADC(eye_rotation);
if (ncFirstPersonCamera_getState() == 2) {
ncFirstPersonCamera_getZoomedInRotation(eye_rotation);
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) ? ml_max_f(305.0f, eye_rotation[0]) : ml_min_f(70.0f, eye_rotation[0]);
func_802C2A8C(eye_rotation);
ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
yaw_setIdeal(eye_rotation[1] + 180.0f);
exit_first_person = FALSE;
if (button_pressed(BUTTON_B) || button_pressed(BUTTON_A) || button_pressed(BUTTON_C_UP)) {
@@ -65,7 +65,7 @@ void bsDroneLook_update(void) {
}
}
__bsDroneLook_getEyePos(eye_position);
func_802C2A64(eye_position);
ncFirstPersonCamera_setZoomedOutPosition(eye_position);
bs_setState(next_state);
}
@@ -73,6 +73,6 @@ void bsDroneLook_end(void) {
if (func_80298850() == 0) {
func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
func_802BE91C();
ncDynamicCamera_exitFirstPerson();
miscflag_clear(0x17);
}

View File

@@ -454,7 +454,7 @@ void bspumpkin_die_init(void) {
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xD);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
baMarker_collisionOff();
func_80292E48();

View File

@@ -5,7 +5,7 @@
void func_80292E80(s32, f32);
f32 func_8029B41C(void);
void func_802BF2C0(f32);
void ncDynamicCamD_func_802BF2C0(f32);
void func_802B6270(void){
baanim_playForDuration_once(ASSET_77_ANIM_BSTIMEOUT, 3.2f);
@@ -13,7 +13,7 @@ void func_802B6270(void){
func_80297970(0.0f);
func_802914CC(0xd);
yaw_setIdeal(func_8029B41C() + 35.0f);
func_802BF2C0(80.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
@@ -54,7 +54,7 @@ void func_802B63F8(void){
func_80297970(0.0f);
func_802914CC(0xd);
yaw_setIdeal(func_8029B41C() + 35.0f);
func_802BF2C0(80.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);

View File

@@ -463,7 +463,7 @@ void bswalrus_die_init(void){
gravity_set(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xd);
func_802BF2C0(30.0f);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8025AB00();
func_8025A2FC(0, 0xfa0);
func_8025A70C(0x1A);
@@ -727,7 +727,7 @@ void bswalrus_timeout_init(void) {
func_8029C7F4(1, 1, 3, 7);
func_80297970(0.0f);
func_802914CC(0xD);
func_802BF2C0(60.0f);
ncDynamicCamD_func_802BF2C0(60.0f);
func_8025A58C(0, 4000);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);