document baeyes.c, bainput.c, and basfx.c

2024-10-30 23:47:11 -05:00 · 2024-10-30 23:47:11 -05:00 · 622902575b
parent 01a4051a87
commit 622902575b
46 changed files with 690 additions and 691 deletions
--- a/decompressed.pal.yaml
+++ b/decompressed.pal.yaml
@ -530,13 +530,13 @@ segments:
  # - [0xF60FB0, c, ba/drone] #DONE
  # - [0xF611B0, c, code_B850] #DONE
  # - [0xF614B0, c, eggshatter] #DONE
-  # - [0xF61680, c, code_BD20] #DONE
+  # - [0xF61680, c, baeyes] #DONE
  # - [0xF61A40, c, ba/falldamage] #DONE
  # - [0xF61D50, c, code_C3F0] #DONE
  # - [0xF61E10, c, code_C4B0]
  # - [0xF63160, c, ba/carry] #DONE
  # - [0xF63310, c, code_D9B0] #DONE
-  # - [0xF638D0, c, code_DF70] #DONE
+  # - [0xF638D0, c, bainput] #DONE
  # - [0xF63D70, c, bakey] #DONE
  # - [0xF63FE0, c, abilityprogress] #DONE
  # - [0xF64270, c, code_E910] #DONE
@ -554,7 +554,7 @@ segments:
  # - [0xF674A0, c, roll]       #DONE
  # - [0xF67740, c, yaw]        #DONE
  # - [0xF67CC0, c, code_12360] #DONE
-  # - [0xF68020, c, code_126C0] #DONE
+  # - [0xF68020, c, basfx] #DONE
  # - [0xF68890, c, code_12F30]
  # - [0xF68FD0, c, bsList]     #DONE
  # - [0xF690E0, c, code_13780] #DONE
@ -914,7 +914,7 @@ segments:
  # - [0x10321F0, .data, code_E910]
  # - [0x1032E10, .data, ba/physics]
  # - [0x1032E20, .data, code_117D0]
-  # - [0x1032F30, .data, code_126C0]
+  # - [0x1032F30, .data, basfx]
  # - [0x1032F50, .data, code_12F30]
  # - [0x1032FF0, .data, code_14420]
  # - [0x1033330, .data, bs/ant]
@ -1137,7 +1137,7 @@ segments:
  # - [0x1043010, .rodata, ba/model]
  # - [0x10430C0, .rodata, ba/drone]
  # - [0x10430D0, .rodata, code_B850]
-  # - [0x10430F0, .rodata, code_BD20]
+  # - [0x10430F0, .rodata, baeyes]
  # - [0x1043110, .rodata, ba/falldamage]
  # - [0x1043130, .rodata, code_C4B0]
  # - [0x1043170, .rodata, code_D9B0]
@ -1153,7 +1153,7 @@ segments:
  # - [0x10435E0, .rodata, roll]
  # - [0x1043600, .rodata, yaw]
  # - [0x1043660, .rodata, code_12360]
-  # - [0x1043690, .rodata, code_126C0]
+  # - [0x1043690, .rodata, basfx]
  # - [0x10436C0, .rodata, code_12F30]
  # - [0x10436E0, .rodata, bastick]
  # - [0x10436F0, .rodata, code_14420]
@ -1394,13 +1394,13 @@ segments:
  # - [0x0106C980, .bss, ba/model]
  # - [0x0106C980, .bss, ba/drone]
  # - [0x0106C980, .bss, eggshatter]
-  # - [0x0106C980, .bss, code_BD20]
+  # - [0x0106C980, .bss, baeyes]
  # - [0x0106C980, .bss, ba/falldamage]
  # - [0x0106C980, .bss, code_C3F0]
  # - [0x0106C980, .bss, code_C4B0]
  # - [0x0106C980, .bss, ba/carry]
  # - [0x0106C980, .bss, code_D9B0]
-  # - [0x0106C980, .bss, code_DF70]
+  # - [0x0106C980, .bss, bainput]
  # - [0x0106C980, .bss, bakey]
  # - [0x0106C980, .bss, abilityprogress]
  # - [0x0106C980, .bss, code_E910]
@ -1418,7 +1418,7 @@ segments:
  # - [0x0106C980, .bss, roll]
  # - [0x0106C980, .bss, yaw]
  # - [0x0106C980, .bss, code_12360]
-  # - [0x0106C980, .bss, code_126C0]
+  # - [0x0106C980, .bss, basfx]
  # - [0x0106C980, .bss, code_12F30]
  # - [0x0106C980, .bss, bsList]
  # - [0x0106C980, .bss, code_13780]
--- a/decompressed.us.v10.yaml
+++ b/decompressed.us.v10.yaml
@ -530,14 +530,14 @@ segments:
  - [0xF60FB0, c, ba/drone]
  - [0xF611B0, c, code_B850]
  - [0xF614B0, c, eggshatter]
-  - [0xF61680, c, code_BD20]    # baeyes
+  - [0xF61680, c, baeyes]
  - [0xF61A40, c, ba/falldamage]
  - [0xF61D50, c, code_C3F0]    # baflag
  - [0xF61E10, c, code_C4B0]
  - [0xF63160, c, ba/carry]
  - [0xF63310, c, code_D9B0]
-  - [0xF638D0, c, code_DF70]    # bainput
-  - [0xF63D70, c, bakey]    # bakey
+  - [0xF638D0, c, bainput]
+  - [0xF63D70, c, bakey]
  - [0xF63FE0, c, abilityprogress] #baknow
  - [0xF64270, c, code_E910]
  - [0xF647A0, c, code_EE40]
@ -554,11 +554,11 @@ segments:
  - [0xF674A0, c, roll]
  - [0xF67740, c, yaw]
  - [0xF67CC0, c, code_12360]
-  - [0xF68020, c, code_126C0] # basfx
+  - [0xF68020, c, basfx]
  - [0xF68890, c, code_12F30]
  - [0xF68FD0, c, bsList]
  - [0xF690E0, c, code_13780] 
-  - [0xF69260, c, bsStoredState] #bastate
+  - [0xF69260, c, bsStoredState] #bastate???
  - [0xF69360, c, code_13A00]
  - [0xF69920, c, bastick]
  - [0xF69D80, c, code_14420]
@ -913,7 +913,7 @@ segments:
  - [0x10321F0, .data, code_E910]
  - [0x1032E10, .data, ba/physics]
  - [0x1032E20, .data, code_117D0]
-  - [0x1032F30, .data, code_126C0]
+  - [0x1032F30, .data, basfx]
  - [0x1032F50, .data, code_12F30]
  - [0x1032FF0, .data, code_14420]
  - [0x1033330, .data, bs/ant]
@ -1135,7 +1135,7 @@ segments:
  - [0x1043010, .rodata, ba/model]
  - [0x10430C0, .rodata, ba/drone]
  - [0x10430D0, .rodata, code_B850]
-  - [0x10430F0, .rodata, code_BD20]
+  - [0x10430F0, .rodata, baeyes]
  - [0x1043110, .rodata, ba/falldamage]
  - [0x1043130, .rodata, code_C4B0]
  - [0x1043170, .rodata, code_D9B0]
@ -1151,7 +1151,7 @@ segments:
  - [0x10435E0, .rodata, roll]
  - [0x1043600, .rodata, yaw]
  - [0x1043660, .rodata, code_12360]
-  - [0x1043690, .rodata, code_126C0]
+  - [0x1043690, .rodata, basfx]
  - [0x10436C0, .rodata, code_12F30]
  - [0x10436E0, .rodata, bastick]
  - [0x10436F0, .rodata, code_14420]
@ -1392,13 +1392,13 @@ segments:
  - [0x1048560, .bss, ba/model]
  - [0x1048560, .bss, ba/drone]
  - [0x1048560, .bss, eggshatter]
-  - [0x1048560, .bss, code_BD20]
+  - [0x1048560, .bss, baeyes]
  - [0x1048560, .bss, ba/falldamage]
  - [0x1048560, .bss, code_C3F0]
  - [0x1048560, .bss, code_C4B0]
  - [0x1048560, .bss, ba/carry]
  - [0x1048560, .bss, code_D9B0]
-  - [0x1048560, .bss, code_DF70]
+  - [0x1048560, .bss, bainput]
  - [0x1048560, .bss, bakey]
  - [0x1048560, .bss, abilityprogress]
  - [0x1048560, .bss, code_E910]
@ -1416,7 +1416,7 @@ segments:
  - [0x1048560, .bss, roll]
  - [0x1048560, .bss, yaw]
  - [0x1048560, .bss, code_12360]
-  - [0x1048560, .bss, code_126C0]
+  - [0x1048560, .bss, basfx]
  - [0x1048560, .bss, code_12F30]
  - [0x1048560, .bss, bsList]
  - [0x1048560, .bss, code_13780]
--- a/include/functions.h
+++ b/include/functions.h
@ -75,7 +75,7 @@ void climbGetBottom(f32 dst[3]);

 void yaw_setIdeal(f32);

-void func_80299BFC(f32);
+void basfx_playOwSfx(f32);

 f32 roll_get(void);

@ -247,7 +247,7 @@ void func_802927E0(f32, f32);
 void func_80292974(f32, f32, f32);
 void func_80292900(f32, f32);

-void func_80292E80(s32, f32);
+void baeyes_openSingleEye(s32, f32);
 void bafalldamage_start(void);
 void func_80293D48(f32, f32);
 f32  func_80294438(void);
@ -273,10 +273,10 @@ void yaw_rotateTimed(f32);
 void func_8029932C(f32);
 void func_80299594(s32, f32);
 void func_80299628(s32);
-void func_80299650(f32, f32);
-void func_80299B58(f32, f32);
-void func_80299CF4(enum sfx_e, f32, s32);
-void func_80299D2C(enum sfx_e, f32, s32);
+void basfx_updateClockSfxSource(f32, f32);
+void basfx_playJumpSfx(f32, f32);
+void basfx_80299CF4(enum sfx_e, f32, s32);
+void basfx_80299D2C(enum sfx_e, f32, s32);
 void baanim_setVelocityMapRanges(f32, f32, f32, f32);
 void baanim_scaleDuration(f32);
 f32  bsStoredState_getLongLegTimer(void);
--- a/src/core2/baeyes.c
+++ b/src/core2/baeyes.c
@ -0,0 +1,122 @@
+#include <ultra64.h>
+#include "functions.h"
+#include "variables.h"
+
+typedef struct{
+    f32 duration;
+    u8 state;
+} BaEyes;
+
+BaEyes baEyes[4];
+
+/* .code */
+f32 baeyes_getEyePosition(s32 id){
+    switch (id) {
+        case 0:
+            return func_8029DFC8();
+        case 1:
+            return func_8029DFD4();
+        case 2:
+            return 0.0f;
+        case 3:
+            return 0.0f;
+        default:
+            return 0.0f;
+    }
+}
+
+
+void baeyes_setEyePosition(s32 id, f32 position){
+    switch(id){
+        case 0:
+            func_8029E0C4(position);
+            break;
+        case 1:
+            func_8029E0D0(position);
+            break;
+        case 2:
+            break;
+        case 3:
+        default:
+            break;
+    }
+}
+
+void baeyes_reset(void){
+    int i;
+    for(i = 0; i < 4; i++){
+        baEyes[i].duration = 1.0f;
+        baEyes[i].state = 0;
+        baeyes_setEyePosition(i, 0.0f);
+    }
+}
+
+void baeyes_blinkSingleEye(s32 id, f32 arg1){
+    baEyes[id].state = 1;
+    baEyes[id].duration = arg1;
+}
+
+void baeyes_closeSingleEye(s32 id, f32 arg1){
+    baEyes[id].state = 5;
+    baEyes[id].duration = arg1;
+}
+
+
+void baeyes_close(void){
+    baeyes_closeSingleEye(0, 0.09f);
+    baeyes_closeSingleEye(1, 0.09f);
+}
+
+void baeyes_openSingleEye(s32 id, f32 arg1){
+    baEyes[id].state = 4;
+    baEyes[id].duration = arg1;
+}
+
+void baeyes_open(void){
+    baeyes_openSingleEye(0, 0.034f);
+    baeyes_openSingleEye(1, 0.034f);
+}
+
+void baeyes_update(void){
+    f32 dt;
+    f32 eye_position;
+    int i;
+
+    dt = time_getDelta();
+    for(i = 0; i < 4; i++){
+        eye_position = baeyes_getEyePosition(i);
+        switch(baEyes[i].state){
+            case 1://L80292F78
+                eye_position += dt/baEyes[i].duration;
+                if(1.0 < eye_position){
+                    eye_position = 1.0f;
+                    baEyes[i].state = 2;
+                }
+                baeyes_setEyePosition(i, eye_position);
+                break; 
+            case 2://L80292FB4
+                baEyes[i].state = 3;
+                break; 
+            case 3://L80292FBC
+            case 4://L80292FBC
+                eye_position -= dt/baEyes[i].duration;
+                if(eye_position < 0.0){
+                    eye_position = 0.0f;
+                    baEyes[i].state = 0;
+                }
+                baeyes_setEyePosition(i, eye_position);
+                break; 
+            case 5://L80292FF8
+                eye_position += dt/baEyes[i].duration;
+                if(1.0 < eye_position){
+                    eye_position = 1.0f;
+                    baEyes[i].state = 0;
+                }
+                baeyes_setEyePosition(i, eye_position);
+                break;
+            case 0://L8029302C
+            default://L8029302C
+                break; 
+        }
+    }
+}
--- a/src/core2/bainput.c
+++ b/src/core2/bainput.c
@ -0,0 +1,93 @@
+#include <ultra64.h>
+#include "functions.h"
+#include "variables.h"
+
+u32 bainput_enableMask;
+f32 bainput_diveCooldown;
+
+int bainput_should_beak_barge(void){
+    return bakey_pressed(BUTTON_B) && can_beak_barge();
+}
+
+int bainput_should_beak_bust(void){
+    return bakey_pressed(BUTTON_Z) && can_beak_bust();
+}
+
+int bainput_should_look_first_person_camera(void){
+    return bakey_pressed(BUTTON_C_UP) && can_view_first_person();
+}
+
+int bainput_should_rotate_camera_left(void){
+    return bakey_pressed(BUTTON_C_LEFT) && bainput_isEnabled(0);
+}
+
+int bainput_should_rotate_camera_right(void){
+    return bakey_pressed(BUTTON_C_RIGHT) && bainput_isEnabled(1);
+}
+
+int bainput_should_zoom_out_camera(void){
+    return bakey_pressed(BUTTON_C_DOWN) && bainput_isEnabled(5);
+}
+
+int bainput_should_poop_egg(void){
+    return bakey_pressed(BUTTON_C_DOWN) && can_egg();
+}
+
+int bainput_should_shoot_egg(void){
+    return bakey_pressed(BUTTON_C_UP) && can_egg();
+}
+
+int bainput_should_feathery_flap(void){
+    return bakey_pressed(BUTTON_A) && can_feathery_flap();
+}
+
+int bainput_should_flap_flip(void){
+    return bakey_pressed(BUTTON_A) && can_flap_flip();
+}
+
+int bainput_should_peck(void){
+    return bakey_pressed(BUTTON_B) && can_peck();
+}
+
+int bainput_should_dive(void){
+    return bakey_pressed(BUTTON_B) && (bainput_diveCooldown == 0.0f) && can_dive();
+}
+
+int bainput_isEnabled(s32 arg0){
+    return bainput_enableMask  & (1 << arg0);
+}
+
+int bainput_should_trot(void){
+    return bakey_pressed(BUTTON_C_LEFT) && can_trot();
+}
+
+int bainput_should_wonderwing(void){
+    return bakey_pressed(BUTTON_C_RIGHT) && can_wonderwing();
+}
+
+void bainput_reset(void){
+    bainput_enableMask = -1;
+    bainput_diveCooldown = 0.0f;
+}
+
+void bainput_enable(s32 arg0, int arg1){
+    if(arg1)
+        bainput_enableMask |= (1 <<arg0);
+    else
+        bainput_enableMask &= ~(1 <<arg0);
+}
+
+void bainput_enable2(s32 arg0, s32 arg1, int arg2){
+    bainput_enable(arg0, arg2);
+    bainput_enable(arg1, arg2);
+}
+
+void bainput_setDiveCooldown(int arg0, f32 arg1){
+    bainput_diveCooldown = arg1;
+}
+
+void bainput_update(void){
+    if(bainput_diveCooldown != 0.0f){
+       bainput_diveCooldown  = ml_max_f(bainput_diveCooldown - time_getDelta(), 0.0f);
+    }
+}
--- a/src/core2/basfx.c
+++ b/src/core2/basfx.c
@ -0,0 +1,236 @@
+#include <ultra64.h>
+#include "functions.h"
+#include "variables.h"
+
+/* .data */
+s32 basfx_jumpIndex = 0;
+s16 basfx_owSfxList[8] = {
+    SFX_32_BANJO_EGHEE,
+    SFX_34_BANJO_AGHOAA,
+    SFX_35_BANJO_WOAH,
+    SFX_37_BANJO_OHWW,
+    SFX_38_BANJO_AYE_1,
+    SFX_39_BANJO_AYE_2,
+    SFX_3A_BANJO_HOUW,
+    SFX_3B_BANJO_GAAH
+};
+
+s16 basfx_jumpSfxList[3] = {
+    SFX_54_BANJO_HOO_1,
+    SFX_55_BANJO_HOO_2,
+    SFX_56_BANJO_HUI,
+};
+
+
+/* .bss */
+u8 basfx_owSfxSource;
+u8 D_8037C6C1;
+u8 D_8037C6C2;
+u8 D_8037C6C3;
+u8 basfx_timeUpSfxSource;
+u32 basfx_owSfxIndex;
+f32 D_8037C6CC;
+struct{
+    u8 sfxsourceIdx;
+    f32 timer;
+    f32 duration;
+    f32 unkC;
+    f32 unk10;
+    f32 unk14;
+    f32 unk18;
+    f32 unk1C;
+} baSfx;
+
+/* .code */
+void basfx_updateClockSfxSource(f32 prev_time, f32 current_time){
+    f32 f20;
+    s32 unks0;
+    if(current_time == 0.0f){
+        func_8030E394(basfx_timeUpSfxSource);
+    } 
+    else if(current_time < 1.0) {
+        if(1.0 <= prev_time){
+            //timer complete
+            sfxsource_setSfxId(basfx_timeUpSfxSource, SFX_1C_ALARMCLOCK);
+            sfxsource_setSampleRate(basfx_timeUpSfxSource, 0x7fff);
+            func_8030E2C4(basfx_timeUpSfxSource);
+        }
+    }
+    else{
+        unks0 = 0;
+        f20 = 5.0f;
+        while(f20 > 0.0f){
+            if(f20 <= prev_time && current_time < f20){
+                sfxsource_setSfxId(basfx_timeUpSfxSource, (unks0) ? SFX_2A_CLOCK_TIC_1 : SFX_51_CLOCK_TIC_2);
+                sfxsource_setSampleRate(basfx_timeUpSfxSource, 0x7fff);
+                func_8030E2C4(basfx_timeUpSfxSource);
+                return;
+            }
+            unks0 ^= 1;
+            f20 -= ml_map_f(f20, 0.0f, 5.0f, 0.1f, 0.25f);
+        }
+    }
+}
+
+void basfx_802997E8(void){
+    f32 f12;
+    f32 f2;
+    if(baSfx.sfxsourceIdx){
+        baSfx.timer += time_getDelta();
+        if(baSfx.duration <= baSfx.timer){
+            sfxsource_freeSfxsourceByIndex(baSfx.sfxsourceIdx);
+            baSfx.sfxsourceIdx = 0;
+        }
+        else{
+            f12 = baSfx.timer/baSfx.duration;
+            if(f12 < baSfx.unkC){
+                f2 = ml_map_f(f12, 0.0f, baSfx.unkC, baSfx.unk14, baSfx.unk18);
+            }
+            else if(f12 < baSfx.unk10){
+                f2 = baSfx.unk18;
+            }
+            else{
+                f2 = ml_map_f(f12, baSfx.unk10, 1.0f, baSfx.unk18, baSfx.unk1C);
+            }
+            sfxsource_playSfxAtVolume(baSfx.sfxsourceIdx, f2);
+        }
+    }
+}
+
+void basfx_802998D0(u8 indx){
+    func_8030E6A4(SFX_19_BANJO_LANDING_08, D_8037C6CC, 22000);
+}
+
+void basfx_reset(void){
+    basfx_owSfxIndex = 0;
+    basfx_owSfxSource = sfxsource_createSfxsourceAndReturnIndex();
+    func_8030DD14(basfx_owSfxSource, 3);
+    func_8030DD90(basfx_owSfxSource, 0);
+    D_8037C6CC = 1.0f;
+    
+    D_8037C6C1 = sfxsource_createSfxsourceAndReturnIndex();
+    sfxsource_setSfxId(D_8037C6C1, SFX_18_BIGBUTT_SLIDE);
+    func_8030DD54(D_8037C6C1, basfx_802998D0);
+    sfxsource_setSampleRate(D_8037C6C1, 28000);
+    func_8030DD14(D_8037C6C1, 2);
+    func_8030DD90(D_8037C6C1, 0);
+
+    D_8037C6C2 = sfxsource_createSfxsourceAndReturnIndex();
+    func_8030DD90(D_8037C6C2, 0);
+    
+    D_8037C6C3 = sfxsource_createSfxsourceAndReturnIndex();
+    func_8030DD90(D_8037C6C3, 0);
+
+    basfx_timeUpSfxSource = sfxsource_createSfxsourceAndReturnIndex();
+    func_8030DD90(basfx_timeUpSfxSource, 0);
+    func_8030DD14(basfx_timeUpSfxSource, 3);
+    baSfx.sfxsourceIdx = 0;
+}
+
+void basfx_free(void){
+    sfxsource_freeSfxsourceByIndex(D_8037C6C1);
+    sfxsource_freeSfxsourceByIndex(basfx_owSfxSource);
+    sfxsource_freeSfxsourceByIndex(D_8037C6C3);
+    sfxsource_freeSfxsourceByIndex(D_8037C6C2);
+    sfxsource_freeSfxsourceByIndex(basfx_timeUpSfxSource);
+    if(baSfx.sfxsourceIdx){
+        sfxsource_freeSfxsourceByIndex(baSfx.sfxsourceIdx);
+    }
+}
+
+void basfx_update(void){
+    basfx_802997E8();
+}
+
+void basfx_80299AAC(void){
+    D_8037C6CC += randf()*0.1 - 0.05;
+    D_8037C6CC = ml_max_f(D_8037C6CC, 0.9f);
+    D_8037C6CC = ml_min_f(D_8037C6CC, 1.5f);
+    sfxsource_playSfxAtVolume(D_8037C6C1, D_8037C6CC);
+    func_8030E2C4(D_8037C6C1);
+}
+
+void basfx_playJumpSfx(f32 arg0, f32 prev_time){
+    basfx_80299CF4(basfx_jumpSfxList[basfx_jumpIndex], randf2(0.93f, 1.09f), 25000);
+    basfx_jumpIndex++;
+    if(basfx_jumpIndex >= 3)
+        basfx_jumpIndex = 0;
+}
+
+void basfx_80299BD4(void){
+    func_8030E5F4(SFX_44_KAZOOIE_AUW, 1.117f);
+}
+
+void basfx_playOwSfx(f32 volume){
+    sfxsource_setSfxId(basfx_owSfxSource, basfx_owSfxList[basfx_owSfxIndex]);
+    sfxsource_playSfxAtVolume(basfx_owSfxSource, volume);
+    func_8030E2C4(basfx_owSfxSource);
+    ++basfx_owSfxIndex;
+    if(basfx_owSfxIndex >= 8)
+        basfx_owSfxIndex = 0;
+}
+
+void basfx_80299C78(u8 indx, enum sfx_e sfx_id, f32 current_time, s32 arg3){
+    sfxsource_setSfxId(indx, sfx_id);
+    sfxsource_playSfxAtVolume(indx, current_time);
+    sfxsource_setSampleRate(indx, arg3);
+    func_8030E2C4(indx);
+}
+
+u8 basfx_80299CC4(void){
+    return D_8037C6C2;
+}
+
+void basfx_80299CD0(void){
+    func_8030E3FC(D_8037C6C2);
+}
+
+void basfx_80299CF4(enum sfx_e sfx_id, f32 prev_time, s32 current_time){
+    basfx_80299C78(D_8037C6C2, sfx_id, prev_time, current_time);
+}
+
+void basfx_80299D2C(enum sfx_e sfx_id, f32 prev_time, s32 current_time){
+    basfx_80299C78(D_8037C6C3, sfx_id, prev_time, current_time);
+}
+
+void basfx_80299D64(void){
+    if(func_8029CEB0() == 4){
+        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
+        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.8f, 32000);
+    }
+    else{
+        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
+    }
+}
+
+void basfx_80299DB8(void){
+    if(func_8029CEB0() == 4){
+        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
+    }
+    else{
+        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
+    }
+}
+
+void basfx_80299E00(void){
+    if(func_8029CEB0() == 4){
+        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 27000);
+    }
+    else{
+        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 14000);
+    }
+}
+
+void basfx_80299E48(void){
+    func_8030E394(basfx_owSfxSource);
+}
+
+void basfx_80299E6C(void){
+    func_8030E394(D_8037C6C2);
+}
+
+void basfx_80299E90(void){
+    func_8030E394(D_8037C6C3);
+}
+
+void basfx_debug(void){}
--- a/src/core2/bs/ant.c
+++ b/src/core2/bs/ant.c
@ -97,7 +97,7 @@ void bsant_idle_update(void){
    if(func_8028B094())
        new_state = BS_38_ANT_FALL;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        new_state = badrone_look();

    if(bastick_getZone() > 0)
@ -309,7 +309,7 @@ static void __bsant_recoil_init(int take_damage){
    baphysics_set_vertical_velocity(510.0f);
    baphysics_set_gravity(-1200.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    bsant_substate = 0;
 }

@ -317,7 +317,7 @@ static void __bsant_recoil_update(void){
    enum bs_e sp1C = 0;
    
    if(baanim_isAt(0.5f))
-        func_80292EA4();
+        baeyes_open();

    switch(bsant_substate){
        case 0:
@ -340,7 +340,7 @@ static void __bsant_recoil_end(void){
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_8029E4EC();
 }

@ -401,7 +401,7 @@ void bsant_die_init(void){
    func_8029C984();
    bsant_substate = 0;
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    batimer_set(0, 2.9f);
 }

@ -446,7 +446,7 @@ void bsant_die_end(void){
    pitch_setIdeal(0.0f);
    roll_setIdeal(0.0f);
    func_80291548();
-    func_80292EA4();
+    baeyes_open();
 }

 void func_8029F398(void){
--- a/src/core2/bs/bBarge.c
+++ b/src/core2/bs/bBarge.c
@ -93,7 +93,7 @@ void bsbarge_update(void){
    switch(D_8037D2A5){
        case 0:
            if(anctrl_isAt(plyrMvmnt, 0.1392f))
-                func_80299BD4();
+                basfx_80299BD4();
            
            if(!anctrl_isStopped(plyrMvmnt))
                break;
--- a/src/core2/bs/bEggAss.c
+++ b/src/core2/bs/bEggAss.c
@ -16,7 +16,7 @@ void bseggass_init(void){
    baphysics_set_target_horizontal_velocity(0.0f);
    func_8029E058(1);
    D_8037D2E0 = (D_8037D2E1 = 1);
-    func_802952A8(5,0);
+    bainput_enable(5,0);
 }

 void bseggass_update(void) {
@ -30,7 +30,7 @@ void bseggass_update(void) {
    next_state = 0;
    plyr_mvmt = baanim_getAnimCtrlPtr();
    has_eggs = (item_empty(ITEM_D_EGGS) == 0);
-    if (should_poop_egg()) {
+    if (bainput_should_poop_egg()) {
        if (has_eggs)
            D_8037D2E0 = ml_min_w(D_8037D2E0 + 1, 3);
        else 
@ -61,7 +61,7 @@ void bseggass_update(void) {


 void bseggass_end(void){
-    func_802952A8(5, 1);
+    bainput_enable(5, 1);
    baphysics_reset_gravity();
    func_8029E058(0);
 }
--- a/src/core2/bs/bEggHead.c
+++ b/src/core2/bs/bEggHead.c
@ -19,7 +19,7 @@ void bsegghead_init(void){
    baphysics_set_target_horizontal_velocity(0.0f);
    func_8029E070(1);
    D_8037D2F0 = (D_8037D2F1 = 1);
-    func_802952A8(2,0);
+    bainput_enable(2,0);
 }

 void bsegghead_update(void) {
@ -33,7 +33,7 @@ void bsegghead_update(void) {
    next_state = 0;
    aCtrl = baanim_getAnimCtrlPtr();
    has_eggs = (item_empty(ITEM_D_EGGS) == 0);
-    if (should_shoot_egg()) {
+    if (bainput_should_shoot_egg()) {
        if (has_eggs)
            D_8037D2F0 = ml_min_w(D_8037D2F0 + 1, 3);
        else 
@ -69,7 +69,7 @@ void bsegghead_update(void) {
 }

 void bsegghead_end(void){
-    func_802952A8(2, 1);
+    bainput_enable(2, 1);
    baphysics_reset_gravity();
    func_8029E070(0);
 }
--- a/src/core2/bs/bFlap.c
+++ b/src/core2/bs/bFlap.c
@ -34,7 +34,7 @@ void bsbflap_init(void) {
    miscFlag_set(MISC_FLAG_12_HAS_FLAPPED);
    batimer_set(0, 2.5f);
    D_8037D30C = sfxsource_createSfxsourceAndReturnIndex();
-    func_80299BD4();
+    basfx_80299BD4();
    D_8037D301 = 0;
    D_8037D308 = 0.0f;
    D_8037D300 = 0;
@ -179,7 +179,7 @@ void bsbflap_update(void){
    if(batimer_isZero(0))
        sp1c = BS_2F_FALL;
    
-    if(should_beak_bust())
+    if(bainput_should_beak_bust())
        sp1c = BS_F_BBUSTER;

    if(player_isStable()){
--- a/src/core2/bs/bFlip.c
+++ b/src/core2/bs/bFlip.c
@ -55,7 +55,7 @@ void bsbflip_init(void){
    bastick_setZoneMax(0, 0.03f);
    bastick_setZoneMax(1, 1.0f);
    func_8029E070(1);
-    func_80299BD4();
+    basfx_80299BD4();
    D_8037D310 = 0;
 }

@ -107,7 +107,7 @@ void bsbflip_update(void){
            anctrl_start(aCtrl, "bsbflip.c", 0xd9);
            D_8037D310 = 2;
        }//L802A316C
-        if(should_beak_bust()){
+        if(bainput_should_beak_bust()){
            sp24 =BS_F_BBUSTER;
        }
        break;
@ -129,7 +129,7 @@ void bsbflip_update(void){
            sp24 = func_8029C9C0(sp24);
            D_8037D310 = 4;
        }
-        else if(should_beak_bust()){
+        else if(bainput_should_beak_bust()){
            sp24 = BS_F_BBUSTER;
        }
        break;
@ -142,7 +142,7 @@ void bsbflip_update(void){
            sp24 = func_8029C9C0(sp24);
            D_8037D310 = 4;
        }
-        else if(should_beak_bust()){
+        else if(bainput_should_beak_bust()){
            sp24 = BS_F_BBUSTER;
        }
        break;
--- a/src/core2/bs/bFly.c
+++ b/src/core2/bs/bFly.c
@ -146,7 +146,7 @@ void bsbfly_enter_init(void){
    baphysics_set_target_horizontal_velocity(0.0f);
    baphysics_set_gravity(-1200.0f);
    func_8029E070(1);
-    func_80299BD4();
+    basfx_80299BD4();
    D_8037D344 = 0;
    D_8037D346 = 0;
 }
@ -287,7 +287,7 @@ void bsbfly_update(void){
    baphysics_set_target_yaw(yaw_get());
    baphysics_set_target_horizontal_velocity(sp38);

-    if(should_beak_bust())
+    if(bainput_should_beak_bust())
        sp54 = BS_F_BBUSTER;

    D_8037D320 = ml_max_f(D_8037D320 - time_getDelta(), 0.0f);
@ -382,7 +382,7 @@ void func_802A411C(void) {
            func_802914CC(5);
            ncDynamicCam5_func_802BF590(&D_8037D338);
            anctrl_setDuration(sp58, 0.05f);
-            func_80299CF4(SFX_50_KAZOOIE_RRRUH, 1.3f, 0x7FFF);
+            basfx_80299CF4(SFX_50_KAZOOIE_RRRUH, 1.3f, 0x7FFF);
            D_8037D345 = 1;
            D_8037D324 = 0.0f;
            D_8037D344 = 1;
@ -441,7 +441,7 @@ void func_802A411C(void) {
 }

 void func_802A4404(void){
-    func_80299E6C();
+    basfx_80299E6C();
    D_8037D345 = 0;
    func_802A34C8();
 }
@ -466,8 +466,8 @@ void func_802A4430(void){
    baphysics_reset_gravity();
    baphysics_reset_terminal_velocity();
    baModel_setYDisplacement(0.0f);
-    func_80299CF4(SFX_31_BANJO_OHHWAAOOO, 1.0f, 0x7fff);
-    func_80299D2C(SFX_61_CARTOONY_FALL, 1.0f, 0x7fff);
+    basfx_80299CF4(SFX_31_BANJO_OHHWAAOOO, 1.0f, 0x7fff);
+    basfx_80299D2C(SFX_61_CARTOONY_FALL, 1.0f, 0x7fff);
    D_8037D320 = 0.35f;
    D_8037D344 = 0;
 }
@ -491,10 +491,10 @@ void func_802A4548(void){
        D_8037D346 = 1;
        next_state = BS_24_FLY;
    }
-    if(should_peck())
+    if(bainput_should_peck())
        next_state = BS_11_BPECK;

-    if(should_beak_bust())
+    if(bainput_should_beak_bust())
        next_state = BS_F_BBUSTER;

    if(player_isStable()){
@ -510,8 +510,8 @@ void func_802A4548(void){

 void func_802A4664(void){
    s32 next_state;
-    func_80299E6C();
-    func_80299E90();
+    basfx_80299E6C();
+    basfx_80299E90();
    next_state = bs_getNextState();
    if(next_state == BS_20_LANDING || next_state == BS_24_FLY || next_state == BS_2D_SWIM_IDLE){
        sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
@ -534,7 +534,7 @@ void bsbfly_beakbomb_crash_init(void) {
    func_8029C7F4(1, 1, 3, BA_PHYSICS_LOCKED_ROTATION);
    func_8029E070(1);
    FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
-    func_80299CF4(SFX_36_BANJO_DOH, 1.0f, 28000);
+    basfx_80299CF4(SFX_36_BANJO_DOH, 1.0f, 28000);
    baMotor_80250D94(1.0f, 0.5f, 0.5f);
    item_dec(ITEM_14_HEALTH);
    func_802A46C8();
@ -548,11 +548,11 @@ void func_802A47E0(void) {
    sp1C = baanim_getAnimCtrlPtr();
    if (anctrl_isAt(sp1C, 0.3659f)) {
        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 14000);
-        func_80299CF4(SFX_8B_KAZOOIE_RAWW, 1.0f, 28000);
+        basfx_80299CF4(SFX_8B_KAZOOIE_RAWW, 1.0f, 28000);
    }
    if (anctrl_isAt(sp1C, 0.6862f)) {
        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
-        func_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 22000);
+        basfx_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 22000);
    }
    if (anctrl_isAt(sp1C, 0.92f)) {
        baphysics_set_target_horizontal_velocity(0.0f);
@ -588,7 +588,7 @@ void func_802A48B4(void) {
        break;
    case 1:
        if (anctrl_isAt(sp18, 0.219f)) {
-            func_80299CF4(SFX_36_BANJO_DOH, 1.0f, 16000);
+            basfx_80299CF4(SFX_36_BANJO_DOH, 1.0f, 16000);
        }
        if (anctrl_isAt(sp18, 0.63f)) {
            next_state = BS_20_LANDING;
@ -635,7 +635,7 @@ void func_802A4A78(s32 arg0) {
    }
    func_802BB3DC(2, 100.0f, 0.85f);
    baanim_playForDuration_onceSmooth(ASSET_D3_ANIM_BSBFLY_BEAKBOMB_REBOUND, 1.2f);
-    func_80299BFC(1.0f);
+    basfx_playOwSfx(1.0f);
    baMotor_80250D94(1.0f, 0.5f, 0.5f);
    _player_getPosition(sp3C);
    func_80294980(sp30);
@ -815,7 +815,7 @@ void func_802A5120(void){
    baphysics_set_target_horizontal_velocity(0.0f);
    baphysics_set_velocity(0);
    baphysics_set_vertical_velocity(2000.0f);
-    func_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
+    basfx_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
 }

 void func_802A5190(void){
--- a/src/core2/bs/bLongLeg.c
+++ b/src/core2/bs/bLongLeg.c
@ -57,7 +57,7 @@ int bslongleg_inSet(s32 move_indx){
 }

 void func_802A531C(void){
-    func_80299650(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
+    basfx_updateClockSfxSource(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
    if(stateTimer_isAt(STATE_TIMER_2_LONGLEG, 0.01f))
        sfxsource_playHighPriority(SFX_3EB_UNKNOWN);
 }
@ -130,7 +130,7 @@ void bsblongleg_enter_init(void){
    func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
    baphysics_set_target_horizontal_velocity(0.0f);
    func_802A5374();
-    func_80299BD4();
+    basfx_80299BD4();
 }

 void bsblongleg_enter_update(void){
@ -168,7 +168,7 @@ void bsblongleg_stand_update(void){
    enum bs_e next_state = 0;
    func_802A531C();
    func_80299594(1, 0.5f);
-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(bakey_pressed(BUTTON_B))
@ -422,7 +422,7 @@ void bsblongleg_slide_init(void){
    pitch_setAngVel(1000.0f, 12.0f);
    roll_setAngularVelocity(1000.0f, 12.0f);
    baphysics_set_target_horizontal_velocity(0.0f);
-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D358 = 1.0f;
 }

@ -432,7 +432,7 @@ void bsblongleg_slide_update(void){
    f32 sp2C;

    func_802A531C();
-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D358 = ml_max_f(D_8037D358 - time_getDelta(), 0.0f);

    if(player_isSliding()){
--- a/src/core2/bs/bShock.c
+++ b/src/core2/bs/bShock.c
@ -33,7 +33,7 @@ void bsbshock_charge_init(void){
    baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
    func_8029E064(1);
    func_8029E070(1);
-    func_80299BD4();
+    basfx_80299BD4();
    D_8037D382 = sfxsource_createSfxsourceAndReturnIndex();
    sfxsource_setSfxId(D_8037D382, SFX_2C_PULLING_NOISE);
    func_8030E04C(D_8037D382, 1.4f, 0.4f, -1.2f);
@ -95,10 +95,10 @@ void bsbshock_charge_update(void){
            baphysics_set_target_horizontal_velocity(0.0f);
    }
    else{//L802A6D18
-        if(should_feathery_flap())
+        if(bainput_should_feathery_flap())
            sp2C = BS_BFLAP;
        
-        if(should_beak_bust())
+        if(bainput_should_beak_bust())
            sp2C = BS_F_BBUSTER;
    }//L802A6D44
    if(anctrl_isAt( aCtrl, 0.3637f) && D_8037D380)
@ -177,10 +177,10 @@ void bsbshock_update(void){
        if(player_isFallTumbling())
            sp2C = BS_3D_FALL_TUMBLING;

-        if(should_feathery_flap())
+        if(bainput_should_feathery_flap())
            sp2C = BS_BFLAP;

-        if(should_beak_bust())
+        if(bainput_should_beak_bust())
            sp2C =BS_F_BBUSTER;
    }

--- a/src/core2/bs/bSwim.c
+++ b/src/core2/bs/bSwim.c
@ -126,7 +126,7 @@ void func_802A7674() {
    func_802A71D8();
    func_802A7304();
    
-    if (should_look_first_person_camera()) {
+    if (bainput_should_look_first_person_camera()) {
        state_id = badrone_look();
    }
    if (bakey_held(BUTTON_A)) {
@ -286,7 +286,7 @@ void func_802A7BD0(void) {

    func_80298760(func_80296560());
    baanim_playForDuration_onceSmooth(0x1A0, 1.4f);
-    func_80299BFC(1.0f);
+    basfx_playOwSfx(1.0f);
    _player_getPosition(sp30);
    func_80294980(sp24);
    func_80257F18(sp24, sp30, &sp3C);
@ -297,7 +297,7 @@ void func_802A7BD0(void) {
    baphysics_set_horizontal_velocity(sp3C, baphysics_get_target_horizontal_velocity());
    func_8029C7F4(1, 1, 2, BA_PHYSICS_LOCKED_ROTATION);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    func_802A744C();
 }

@ -313,7 +313,7 @@ void func_802A7CA8(void) {
    particleEmitter_setParticleVelocityRange(p_ctrl, -60.0f, -50.0f, -60.0f, 60.0f, 100.0f, 60.0f);
    particleEmitter_emitN(p_ctrl, 1);
    if (baanim_isAt(0.3f)) {
-        func_80292EA4();
+        baeyes_open();
    }
    if (anctrl_isStopped(baanim_getAnimCtrlPtr())) {
        next_state = BS_2B_DIVE_IDLE;
@ -325,7 +325,7 @@ void func_802A7CA8(void) {
 void func_802A7D74(void) {
    func_80297CA8();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802A75B0();
 }

@ -337,7 +337,7 @@ void bsSwim_dive_init(void) {
    baphysics_set_target_velocity(0);
    func_802A744C();
    pitch_setAngVel(200.0f, 2.5f);
-    func_80299BD4();
+    basfx_80299BD4();
    D_8037D396 = 0;
 }

@ -405,7 +405,7 @@ void func_802A7F6C(void) {
    batimer_set(0, 0.0f);
    batimer_set(1, 0.0f);
    func_802906A4(3);
-    func_80299CF4(SFX_CA_BANJO_DROWNING_1, 1.0f, 24000);
+    basfx_80299CF4(SFX_CA_BANJO_DROWNING_1, 1.0f, 24000);
 }

 void func_802A8098(void) {
@ -423,7 +423,7 @@ void func_802A8098(void) {
        || batimer_isAt(1, 0.8f) 
        || batimer_isAt(1, 1.4f)
    ) {
-        func_80299CF4(SFX_CB_BANJO_DROWNING_2, 1.0f, 24000);
+        basfx_80299CF4(SFX_CB_BANJO_DROWNING_2, 1.0f, 24000);
    }
    switch (D_8037D396) {
    case 0:
--- a/src/core2/bs/bTrot.c
+++ b/src/core2/bs/bTrot.c
@ -112,7 +112,7 @@ void func_802A8A40(void){
 }

 void func_802A8AD8(void){
-    func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), stateTimer_get(STATE_TIMER_3_TURBO_TALON));
+    basfx_updateClockSfxSource(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);
        stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
@ -190,7 +190,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
    if( bastick_getZone(arg0) > 0)
        arg0 = BS_16_BTROT_WALK;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        arg0 = badrone_look();

    if(func_8028B094())
@ -217,14 +217,14 @@ void bsbtrot_enter_init(void){
    func_8029C7F4(1,1,2, BA_PHYSICS_NORMAL);
    baphysics_set_target_horizontal_velocity(0.0f);
    func_802A8A40();
-    func_80299BD4();
-    func_802952A8(0,0);
+    basfx_80299BD4();
+    bainput_enable(0,0);
 }

 void bsbtrot_enter_update(void){
    enum bs_e next_state = 0;
    AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
-    func_802952A8(0,1);
+    bainput_enable(0,1);
    func_80299628(1);
    if(anctrl_isStopped(aCtrl))
        next_state = BS_15_BTROT_IDLE;
@ -237,7 +237,7 @@ void bsbtrot_enter_update(void){
 }

 void bsbtrot_enter_end(void){
-    func_802952A8(0,1);
+    bainput_enable(0,1);
    func_802A8BB0();
 }

@ -413,13 +413,13 @@ void bsbtrot_jump_update(void){
                func_8029957C(1);
                D_8037D3A4 = 3;
                if(220.0f < baphysics_get_target_horizontal_velocity())
-                    func_80299AAC();
+                    basfx_80299AAC();
                func_8029C22C();
            }
            break;
        case 3://L802A9660
            if(220.0f < baphysics_get_target_horizontal_velocity())
-                func_80299AAC();
+                basfx_80299AAC();
            func_802A9320();
            func_80299628(1);
            if(anctrl_isStopped(aCtrl)){
@ -432,7 +432,7 @@ void bsbtrot_jump_update(void){
            break;
        case 4://L802A96F0
            if(220.0f < baphysics_get_target_horizontal_velocity())
-                func_80299AAC();
+                basfx_80299AAC();
            
            func_802A9320();
            func_80299628(1);
@ -446,7 +446,7 @@ void bsbtrot_jump_update(void){
            break;
        case 5://L802A9780
            if(220.0f < baphysics_get_target_horizontal_velocity())
-                func_80299AAC();
+                basfx_80299AAC();
            func_802A9320();
            func_80299628(1);
            if(anctrl_isStopped(aCtrl))
@ -454,7 +454,7 @@ void bsbtrot_jump_update(void){
            break;
    }//LL802A97D0

-    if(should_peck())
+    if(bainput_should_peck())
        sp2C = BS_11_BPECK;

    if(player_isFallTumbling())
@ -513,7 +513,7 @@ void bsbtrot_slide_init(void){
    pitch_setAngVel(1000.0f, 12.0f);
    roll_setAngularVelocity(1000.0f, 12.0f);
    baphysics_set_target_horizontal_velocity(0.0f);
-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D3A0 = 1.0f;
 }

@ -525,7 +525,7 @@ void bsbtrot_slide_update(void){
    func_802A8AD8();
    if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
        func_802A87C0();
-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D3A0 = ml_max_f(D_8037D3A0-time_getDelta(), 0.0f);
    if(player_shouldSlideTrot()){
        func_80294480(sp30);
@ -612,7 +612,7 @@ void bsbtrot_fall_update(void){
            anctrl_setPlaybackType(aCtrl,  ANIMCTRL_ONCE);
            func_8029957C(1);
            if(220.0f < baphysics_get_target_horizontal_velocity()){
-                func_80299AAC();
+                basfx_80299AAC();
            }
            func_8029C22C();
            D_8037D3A4 = 2;
@ -620,7 +620,7 @@ void bsbtrot_fall_update(void){
        break;
    case 2://L802A9E78
        if(220.0f < baphysics_get_target_horizontal_velocity())
-            func_80299AAC();
+            basfx_80299AAC();
        
        func_802A9320();
        func_80299628(1);
@ -634,7 +634,7 @@ void bsbtrot_fall_update(void){
        break;
    case 3://L802A9F08
        if(220.0f < baphysics_get_target_horizontal_velocity())
-            func_80299AAC();
+            basfx_80299AAC();

        func_802A9320();
        func_80299628(1);
@ -648,7 +648,7 @@ void bsbtrot_fall_update(void){
        break;
    case 4://802A9F98
        if(220.0f < baphysics_get_target_horizontal_velocity())
-            func_80299AAC();
+            basfx_80299AAC();
        
        func_802A9320();
        func_80299628(1);
@ -710,7 +710,7 @@ void bsbtrot_ow_init(void){
    func_802A8A40();
    func_80298760(func_80296560());
    baanim_playForDuration_onceSmooth(ASSET_66_ANIM_BSBTROT_OW, 1.1f);
-    func_80299BFC(1.0f);
+    basfx_playOwSfx(1.0f);
    _player_getPosition(sp30);
    func_80294980(sp24);
    func_80257F18(sp24, sp30, &sp3C);
@ -725,7 +725,7 @@ void bsbtrot_ow_init(void){
    baphysics_set_vertical_velocity(func_802987C4());
    baphysics_set_gravity(func_802987E4());
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
 }

 void bsbtrot_ow_update(void){
@ -734,7 +734,7 @@ void bsbtrot_ow_update(void){
        func_802B6FA8();

    if(baanim_isAt(0.3f))
-        func_80292EA4();
+        baeyes_open();

    if(player_isFallTumbling())
        sp1C = BS_3D_FALL_TUMBLING;
@ -752,7 +752,7 @@ void bsbtrot_ow_end(void){
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802A8BB0();
 }

--- a/src/core2/bs/bWhirl.c
+++ b/src/core2/bs/bWhirl.c
@ -89,20 +89,20 @@ void bsbwhirl_enter_init(void){
    core1_ce60_incOrDecCounter(FALSE);
    func_8025A55C(0, 0xfa0, 0xd);
    func_8025A6EC(0x25, 0x6d60);
-    func_80299BD4();
-    func_802952A8(1,0);
+    basfx_80299BD4();
+    bainput_enable(1,0);
 }

 void bsbwhirl_enter_update(void){
    enum bs_e sp1C = 0;
-    func_802952A8(1,1);
+    bainput_enable(1,1);
    if(anctrl_isStopped(baanim_getAnimCtrlPtr()))
        sp1C = BS_1B_WONDERWING_IDLE;
    bs_setState(sp1C);
 }

 void bsbwhirl_enter_end(void){
-    func_802952A8(1,1);
+    bainput_enable(1,1);
    __bsbwhirl_end();
 }

@ -189,7 +189,7 @@ void bsbwhirl_jump_init(void){
    baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
    baphysics_set_vertical_velocity(D_80364AE0);
    baphysics_set_gravity(D_80364AE4);
-    func_80299B58(0.91f, 1.09f);
+    basfx_playJumpSfx(0.91f, 1.09f);
    D_8037D3B4 = 0;
 }

--- a/src/core2/bs/bbuster.c
+++ b/src/core2/bs/bbuster.c
@ -91,7 +91,7 @@ void bsbbuster_update(void){

    D_8037D2B8 = 0;
    if(anctrl_isAt(aCtrl, 0.24f))
-        func_80299BD4();
+        basfx_80299BD4();

    switch(D_8037D2BA){
        case 0://8029FDF0
--- a/src/core2/bs/beeMain.c
+++ b/src/core2/bs/beeMain.c
@ -72,7 +72,7 @@ void func_802A10D4(void){
    if(func_8028B094())
        s0 = 0x88;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        s0 = badrone_look();
    
    if(bastick_getZone() > 0)
@ -330,7 +330,7 @@ void func_802A18E8(s32 arg0){
    baphysics_set_vertical_velocity(510.0f);
    baphysics_set_gravity(-1200.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    D_8037D2D4 = 0;
 }

@ -339,7 +339,7 @@ void func_802A1A50(void){

    sp1C= 0;
    if(baanim_isAt(0.5f)){
-        func_80292EA4();
+        baeyes_open();
    }
    switch(D_8037D2D4){
        case 0:
@ -363,7 +363,7 @@ void func_802A1B28(void){
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802A02C0();
 }

@ -421,7 +421,7 @@ void bsbeemain_die_init(void){
    baphysics_set_gravity(-1200.0f);
    pitch_setAngVel(1000.0f, 12.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    func_802914CC(0xd);
    ncDynamicCamD_func_802BF2C0(30.0f);
    func_8029C984();
@ -471,7 +471,7 @@ void func_802A1F2C(void){
    core1_ce60_incOrDecCounter(FALSE);
    baphysics_reset_gravity();
    func_80291548();
-    func_80292EA4();
+    baeyes_open();
    func_802A02C0();
 }

--- a/src/core2/bs/climb.c
+++ b/src/core2/bs/climb.c
@ -148,17 +148,17 @@ void bsclimb_move_update(void){
        || map == MAP_31_RBB_RUSTY_BUCKET_BAY
    ){
        if(baanim_isAt(0.25f))
-            func_80299D2C(SFX_D2_QUIET_METALLIC, 1.1f, 32000);
+            basfx_80299D2C(SFX_D2_QUIET_METALLIC, 1.1f, 32000);
        
        if(baanim_isAt(0.75f))
-            func_80299D2C(SFX_D2_QUIET_METALLIC, 1.2f, 32000);
+            basfx_80299D2C(SFX_D2_QUIET_METALLIC, 1.2f, 32000);
    }
    else{//L802ABB34
        if(baanim_isAt(0.25f))
-            func_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.77f, 22000);
+            basfx_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.77f, 22000);

        if(baanim_isAt(0.75f))
-            func_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.87f, 22000);
+            basfx_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.87f, 22000);
    }//L802ABB84

    if(!func_802AB788() && baphysics_get_vertical_velocity() < 30.0f)
--- a/src/core2/bs/croc.c
+++ b/src/core2/bs/croc.c
@ -49,7 +49,7 @@ void __bscroc_jumpSfx(void){

 void func_802ABE70(void){
    f32 sp1C = stateTimer_get(STATE_TIMER_3_TURBO_TALON);
-    func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), sp1C);
+    basfx_updateClockSfxSource(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);
        stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
@ -122,7 +122,7 @@ void bscroc_idle_update(void){
    if(func_8028B094())
        next_state = BS_61_CROC_FALL;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(bastick_getZone() > 0)
@ -357,7 +357,7 @@ static void __bscroc_recoil_init(s32 damage){
    baphysics_set_vertical_velocity(510.0f);
    baphysics_set_gravity(-1200.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    D_8037D3EC = 0;
 }

@ -365,7 +365,7 @@ static void __bscroc_recoil_update(void){
    enum bs_e next_state = 0;
    func_802ABE70();
    if(baanim_isAt(0.5f))
-        func_80292EA4();
+        baeyes_open();
    
    switch(D_8037D3EC){
        case 0:
@ -387,7 +387,7 @@ void __bscroc_recoil_end(void){
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802ABFBC();
 }

@ -443,7 +443,7 @@ void bscroc_die_init(void){
    baphysics_set_gravity(-1200.0f);
    pitch_setAngVel(1000.0f, 12.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    func_802914CC(0xd);
    ncDynamicCamD_func_802BF2C0(30.0f);
    func_8029C984();
@ -496,7 +496,7 @@ void bscroc_die_end(void){
    pitch_setIdeal(0.0f);
    roll_setIdeal(0.0f);
    func_80291548();
-    func_80292EA4();
+    baeyes_open();
 }

 int bscroc_hitboxActive(void){
--- a/src/core2/bs/crouch.c
+++ b/src/core2/bs/crouch.c
@ -70,7 +70,7 @@ void bscrouch_init(void){
    baphysics_get_velocity(sp28);
    D_8037D400 = gu_sqrtf(sp28[0]*sp28[0] + sp28[2]*sp28[2]);
    if(140.0f < D_8037D400)
-        func_80299AAC();
+        basfx_80299AAC();

    if(func_8025801C(sp28, &sp20))
        baphysics_set_target_yaw(sp20);
@ -94,7 +94,7 @@ void bscrouch_update(void){
    if(220.0f < sp30)
        func_802929F8();
    if(160.0f < sp30)
-        func_80299AAC();
+        basfx_80299AAC();
    sp20 = yaw_getIdeal();
    temp_f2 = mlAbsF(mlDiffDegF(sp20, yaw_get()));
    
@ -187,22 +187,22 @@ enum bs_e func_802ADCD4(enum bs_e arg0){
            arg0 = bs_getTypeOfJump();

    }else{
-        if(should_wonderwing())
+        if(bainput_should_wonderwing())
            func_80346C10(&arg0, -1, BS_1A_WONDERWING_ENTER, ITEM_10_GOLD_FEATHER, 1);

-        if(should_trot())
+        if(bainput_should_trot())
            arg0 = BS_14_BTROT_ENTER;

-        if(should_poop_egg())
+        if(bainput_should_poop_egg())
            func_80346C10(&arg0, -1, BS_A_EGG_ASS, ITEM_D_EGGS, 0);

-        if(should_shoot_egg())
+        if(bainput_should_shoot_egg())
            func_80346C10(&arg0, -1, BS_9_EGG_HEAD, ITEM_D_EGGS, 0);

-        if(should_flap_flip())
+        if(bainput_should_flap_flip())
            arg0 = BS_12_BFLIP;

-        if(should_beak_barge())
+        if(bainput_should_beak_barge())
            arg0 = BS_BBARGE;


--- a/src/core2/bs/die.c
+++ b/src/core2/bs/die.c
@ -60,7 +60,7 @@ void bsdie_init(void){
    batimer_set(0,2.9f);
    D_8037D414 = 0;
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
 }

 void bsdie_update(void){
@ -74,7 +74,7 @@ void bsdie_update(void){
                anctrl_setSubRange(aCtrl, 0.0f, 1.0f);
                anctrl_setPlaybackType(aCtrl,  ANIMCTRL_ONCE);
                baphysics_set_vertical_velocity(400.0f);
-                func_80299DB8();
+                basfx_80299DB8();
                FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.0f, 18000);
                baMotor_80250D94(1.0f, 1.0f, 0.4f);
                _bsdie_802ADE20();
@ -83,7 +83,7 @@ void bsdie_update(void){
            break;
        case 1://L802AE134
            if(_bsdie_802ADE00()){
-                func_80299E00();
+                basfx_80299E00();
                FUNC_8030E624(SFX_38_BANJO_AYE_1, 1.0f, 18000);
                baMotor_80250D94(1.0f, 0.5f, 0.4f);
                D_8037D414 = 2;
@ -131,5 +131,5 @@ void bsdie_end(void){
    pitch_setIdeal(0.0f);
    roll_setIdeal(0.0f);
    func_80291548();
-    func_80292EA4();
+    baeyes_open();
 }
--- a/src/core2/bs/dronelook.c
+++ b/src/core2/bs/dronelook.c
@ -16,7 +16,7 @@ void bsDroneLook_init(void) {
    f32 eye_rotation[3];
    enum asset_e anim_id;

-    func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000);
+    basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000);
    func_8029BCF8(&anim_id, &anim_duration);
    baanim_playForDuration_loopSmooth(anim_id, anim_duration);
    func_8029C7F4(1, 1, 3, BA_PHYSICS_NORMAL);
@ -76,7 +76,7 @@ void bsDroneLook_update(void) {

 void bsDroneLook_end(void) {
    if (func_80298850() == 0) {
-        func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
+        basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
    }
    ncDynamicCamera_exitFirstPerson();
    miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW);
--- a/src/core2/bs/jig.c
+++ b/src/core2/bs/jig.c
@ -62,7 +62,7 @@ void bsjig_jiggy_update(void){
    yaw_setIdeal(func_8029B41C());
    
    if(anctrl_isAt(aCtrl, 0.6502f))
-        func_80299BD4();
+        basfx_80299BD4();

    if(anctrl_isAt(aCtrl, 0.835f)){
        D_8037D4B0++;
@ -188,7 +188,7 @@ void bsjig_notedoor_update(void){
    enum bs_e sp1C = 0;

    if(baanim_isAt(0.59f) || baanim_isAt(0.84f))
-        func_80299CF4(SFX_3EA_UNKNOWN, 1.0f, 30000);
+        basfx_80299CF4(SFX_3EA_UNKNOWN, 1.0f, 30000);

    if(baanim_isStopped())
        sp1C = BS_1_IDLE;
--- a/src/core2/bs/jump.c
+++ b/src/core2/bs/jump.c
@ -9,7 +9,7 @@
 #include "core2/ba/timer.h"

 f32 func_80294438(void);
-void func_80299B58(f32, f32);
+void basfx_playJumpSfx(f32, f32);
 f32 bastick_distance(void);
 f32 bastick_getAngleRelativeToBanjo(void);
 void baanim_playForDuration_loop(s32, f32);
@ -29,7 +29,7 @@ u8 D_8037D4C2;

 /* .code */
 void func_802B1100(void){
-    func_80299B58(0.91f, 1.09f);
+    basfx_playJumpSfx(0.91f, 1.09f);
 }

 void bsjump_init(void){
@ -141,13 +141,13 @@ void bsjump_update(void){
    if(bakey_released(BUTTON_A))
        D_8037D4C2 = 0;

-    if(should_feathery_flap())
+    if(bainput_should_feathery_flap())
        sp34 = BS_BFLAP;

-    if(should_peck())
+    if(bainput_should_peck())
        sp34 = BS_11_BPECK;

-    if(should_beak_bust())
+    if(bainput_should_beak_bust())
        sp34 = BS_F_BBUSTER;

    if(player_isStable()){
@ -218,13 +218,13 @@ void bsjump_fall_update(void){
        if(player_isFallTumbling())
            sp2C = BS_3D_FALL_TUMBLING;

-        if(should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED))
+        if(bainput_should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED))
            sp2C = BS_BFLAP;

-        if(should_peck())
+        if(bainput_should_peck())
            sp2C = BS_11_BPECK;
        
-        if(should_beak_bust())
+        if(bainput_should_beak_bust())
            sp2C = BS_F_BBUSTER;
        
        if(player_inWater())
@ -393,7 +393,7 @@ void bsjump_tumble_init(void){
    if(bafalldamage_get_state() == 1){
        batimer_set(0, 0.5f);
        batimer_set(1, 0.41f);
-        func_80299CF4(SFX_52_BANJO_YAH_OH, 1.0f, 22000);
+        basfx_80299CF4(SFX_52_BANJO_YAH_OH, 1.0f, 22000);
    }else{
        batimer_set(0, 0.0f);
        batimer_set(1, 0.01f);
@ -404,7 +404,7 @@ void bsjump_tumble_init(void){
 void bsjump_tumble_update(void){
    enum bs_e sp1C = 0;
    if(batimer_decrement(1))
-        func_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
+        basfx_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
    
    batimer_decrement(0);
    func_802B6FA8();
@ -412,13 +412,13 @@ void bsjump_tumble_update(void){
        pitch_setIdeal(pitch_getIdeal() + 20.0f);
    }
    if(batimer_isNonzero(0)){
-        if(should_feathery_flap())
+        if(bainput_should_feathery_flap())
            sp1C = BS_BFLAP;

-        if(should_peck())
+        if(bainput_should_peck())
            sp1C = BS_11_BPECK;

-        if(should_beak_bust())
+        if(bainput_should_beak_bust())
            sp1C = BS_F_BBUSTER;
    }//L802B1F2C

@ -441,5 +441,5 @@ void bsjump_tumble_end(void){
    }
    func_8029CB84();
    baModel_setYDisplacement(0.0f);
-    func_80299E6C();
+    basfx_80299E6C();
 }
--- a/src/core2/bs/ow.c
+++ b/src/core2/bs/ow.c
@ -22,10 +22,10 @@ void bsow_init(void){
    anctrl_setDuration(plyr_mvmnt, 1.70000004768f);
    anctrl_setPlaybackType(plyr_mvmnt,  ANIMCTRL_ONCE);
    anctrl_start(plyr_mvmnt, "bsow.c", 0x50);
-    func_80299BFC(1.0f);
+    basfx_playOwSfx(1.0f);
    func_802B360C();
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    D_8037D4D0 = 0;
    func_802B1FD0(1);
 }
@ -48,7 +48,7 @@ void bsow_update(void) {
    }

    if (baanim_isAt(0.3f) != 0) {
-        func_80292EA4();
+        baeyes_open();
    }
    if (player_isFallTumbling() != 0) {
        sp1C = BS_3D_FALL_TUMBLING;
@ -69,5 +69,5 @@ void bsow_end(void){
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
 }
--- a/src/core2/bs/pumpkin.c
+++ b/src/core2/bs/pumpkin.c
@ -92,7 +92,7 @@ void bspumpkin_idle_update(void) {
    if (func_8028B094()) {
        next_state = BS_4B_PUMPKIN_FALL;
    }
-    if (should_look_first_person_camera()) {
+    if (bainput_should_look_first_person_camera()) {
        next_state = badrone_look();
    }
    if (bastick_getZone() > 0) {
@ -187,7 +187,7 @@ void bspumpkin_jump_update(void) {
    case 0:
        if (baphysics_get_vertical_velocity() < 0.0f) {
            if (func_8028B254(130)) {
-                func_80292E48();
+                baeyes_close();
                anctrl_setDuration(anim_ctrl, 0.7f);
                anctrl_setSubRange(anim_ctrl, 0.0f, 0.8059f);
                anctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
@ -201,7 +201,7 @@ void bspumpkin_jump_update(void) {
        break;
    case 1:
        if (func_8028B254(130)) {
-            func_80292E48();
+            baeyes_close();
            anctrl_setSubRange(anim_ctrl, 0.0f, 0.8059f);
            anctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
            D_8037D4E0 = 2;
@ -218,7 +218,7 @@ void bspumpkin_jump_update(void) {
        break;
    case 3:
        if (anctrl_isStopped(anim_ctrl)) {
-            func_80292EA4();
+            baeyes_open();
            baphysics_set_target_horizontal_velocity(0.0f);
            next_state = BS_48_PUMPKIN_IDLE;
        }
@ -236,7 +236,7 @@ void bspumpkin_jump_update(void) {
 }

 void bspumpkin_jump_end(void){
-    func_80292EA4();
+    baeyes_open();
    baphysics_reset_gravity();
    func_802B229C();
 }
@ -365,7 +365,7 @@ void __bspumpkin_bounce_init(s32 arg0) {
    baphysics_set_vertical_velocity(510.0f);
    baphysics_set_gravity(-1200.0f);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    D_8037D4E0 = 0;
 }

@ -374,7 +374,7 @@ void __bspumpkin_bounce_update(void) {

    next_state = 0;
    if (baanim_isAt(0.61f)) {
-        func_80292EA4();
+        baeyes_open();
    }
    switch (D_8037D4E0) {
    case 0:
@ -397,7 +397,7 @@ void __bspumpkin_bounce_end(void) {
    func_80297CA8();
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802B229C();
 }

@ -458,7 +458,7 @@ void bspumpkin_die_init(void) {
    ncDynamicCamD_func_802BF2C0(30.0f);
    func_8029C984();
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    batimer_set(1, 2.9f);
    D_8037D4E0 = 0;
 }
@ -528,7 +528,7 @@ void bspumpkin_die_end(void) {
    baphysics_reset_gravity();
    pitch_setIdeal(0.0f);
    roll_setIdeal(0.0f);
-    func_80292EA4();
+    baeyes_open();
    func_80291548();
 }

--- a/src/core2/bs/slide.c
+++ b/src/core2/bs/slide.c
@ -73,7 +73,7 @@ void bsslide_init(void){
    baphysics_set_horizontal_velocity(yaw_getIdeal() ,baphysics_get_target_horizontal_velocity());
    pitch_setAngVel(800.0f, 8.0f);
    baphysics_set_target_horizontal_velocity(0.0f);
-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D524 = 0;
    D_8037D528 = 1.0f;

@ -85,7 +85,7 @@ void bsslide_update(void){
    f32 sp2C;
    f32 sp28;

-    func_80299AAC();
+    basfx_80299AAC();
    D_8037D528 = ml_max_f(D_8037D528 - time_getDelta(), 0.0f);
    if(player_isSliding()){
        func_80294480(sp30);
--- a/src/core2/bs/splat.c
+++ b/src/core2/bs/splat.c
@ -34,7 +34,7 @@ void bssplat_init(void){
        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
        baMotor_80250D94(1.0f, 0.5f, 0.4f);
    }
-    func_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 28000);
+    basfx_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 28000);
    func_802B4570();
    func_802BB3DC(0, 45.0f, 0.71f);
    if(item_getCount(ITEM_14_HEALTH) == 0)
--- a/src/core2/bs/stand.c
+++ b/src/core2/bs/stand.c
@ -73,7 +73,7 @@ s32 func_802B488C(s32 arg0){
    if(bakey_pressed(BUTTON_A))
        retVal = bs_getTypeOfJump();

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        retVal = badrone_look();

    if(player_isSliding())
@ -106,7 +106,7 @@ void func_802B4A10(AnimCtrl *arg0){
    }//L802B4A54

    if(anctrl_isAt(arg0, 0.2057f)) //(30/145)
-        func_80292E48();
+        baeyes_close();
    //L802B4A78

    if(anctrl_isAt(arg0, 0.2555f)){ //(37/145)
@ -124,7 +124,7 @@ void func_802B4A10(AnimCtrl *arg0){
    }//L802B4B0C

    if(anctrl_isAt(arg0, 0.3607f)){
-        func_80292EA4();
+        baeyes_open();
    }//L802B4B30

    if(anctrl_isAt(arg0, 0.4183f)){
@ -149,7 +149,7 @@ void func_802B4A10(AnimCtrl *arg0){
    }//L802B4BF4

    if(anctrl_isAt(arg0, 0.6688f))
-        func_80292E48();
+        baeyes_close();
    //L802B4C18

    if(anctrl_isAt(arg0, 0.6964f)){
@ -158,7 +158,7 @@ void func_802B4A10(AnimCtrl *arg0){
    }//L802B4C50

    if(anctrl_isAt(arg0, 0.7747f))
-        func_80292EA4();
+        baeyes_open();
    //L802B4C74

    if(anctrl_isAt(arg0, 0.7822f)){
@ -204,7 +204,7 @@ void bsstand_update(void) {
    sp18 = D_80364D20[D_8037D540];
    if (sp18 & 8) {
        if (sp18 & 4) {
-            if (anctrl_isAt(anim_ctrl, 0.0909f)) func_80299BD4();
+            if (anctrl_isAt(anim_ctrl, 0.0909f)) basfx_80299BD4();
            if (anctrl_isAt(anim_ctrl, 0.0909f)) func_8029E070(1);
            if (anctrl_isAt(anim_ctrl, 0.6818f)) func_8029E070(0);
        }//L802B4E70
@ -224,16 +224,16 @@ void bsstand_update(void) {
                anctrl_start(anim_ctrl, "bsstand.c", 0x170);
            }
        } else {
-            if (anctrl_isAt(anim_ctrl, 0.069f))  func_80299D2C(SFX_4B_GULPING, 1.4f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.1677f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.0f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.2441f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.03f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.3141f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.06f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.3859f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.5f, 0x7D00);
-            if (anctrl_isAt(anim_ctrl, 0.414f))  func_80299CF4(SFX_2D_KABOING, 1.0f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.55f))   func_80299CF4(SFX_A3_BANJO_DOUBLE_COUGH, 1.0f, 0x6D60);
-            if (anctrl_isAt(anim_ctrl, 0.6187f)) func_80299D2C(SFX_A0_COUGHING, 1.7f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.7108f)) func_80299D2C(SFX_A0_COUGHING, 1.6f, 0x4650);
-            if (anctrl_isAt(anim_ctrl, 0.7927f)) func_80299D2C(SFX_A0_COUGHING, 1.5f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.069f))  basfx_80299D2C(SFX_4B_GULPING, 1.4f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.1677f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.0f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.2441f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.03f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.3141f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.06f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.3859f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.5f, 0x7D00);
+            if (anctrl_isAt(anim_ctrl, 0.414f))  basfx_80299CF4(SFX_2D_KABOING, 1.0f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.55f))   basfx_80299CF4(SFX_A3_BANJO_DOUBLE_COUGH, 1.0f, 0x6D60);
+            if (anctrl_isAt(anim_ctrl, 0.6187f)) basfx_80299D2C(SFX_A0_COUGHING, 1.7f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.7108f)) basfx_80299D2C(SFX_A0_COUGHING, 1.6f, 0x4650);
+            if (anctrl_isAt(anim_ctrl, 0.7927f)) basfx_80299D2C(SFX_A0_COUGHING, 1.5f, 0x4650);
        }
    } else /*L802B50D4*/if ((sp18 & 0x10) != 0) {
        func_802B4A10(anim_ctrl);
@ -275,7 +275,7 @@ void bsstand_update(void) {
 void bsstand_end(void){
    func_8029E070(0);
    func_802900FC();
-    func_80292EA4();
+    baeyes_open();
 }

 //bsStand_Land_init
@ -291,12 +291,12 @@ void bsstand_landing_update(void){

    if(anctrl_getIndex(sp18) == ASSET_D2_ANIM_BSSPLAT){
        if(anctrl_isAt(sp18, 0.8264f)){
-            func_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
+            basfx_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
        }

        //L802B52F8
        if(anctrl_isAt(sp18, 0.8864f)){
-            func_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
+            basfx_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
        }
    }
    //L802B531C
--- a/src/core2/bs/swim.c
+++ b/src/core2/bs/swim.c
@ -5,7 +5,7 @@
 #include "core2/ba/anim.h"
 #include "core2/ba/physics.h"

-extern void func_80295328(s32, f32);
+extern void bainput_setDiveCooldown(s32, f32);

 bool bsswim_inset(enum bs_e state_id);

@ -119,11 +119,11 @@ void func_802B5774(void) {
    }
    if (bsbswim_inSet(prev_state) != 0) {
        if (prev_state == BS_54_SWIM_DIE) {
-            func_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
+            basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
        } else {
-            func_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), 3600.0f, 0.0f, 8000.0f, 30000.0f));
+            basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), 3600.0f, 0.0f, 8000.0f, 30000.0f));
        }
-        func_80295328(4, 0.7f);
+        bainput_setDiveCooldown(4, 0.7f);
    }
    if ((anctrl_getIndex(anim_ctrl) == ASSET_57_ANIM_BSSWIM_IDLE) && (prev_state != BS_4C_LANDING_IN_WATER)) {
        anctrl_setSmoothTransition(anim_ctrl, 0);
@ -170,10 +170,10 @@ void func_802B5950(void) {
    if (!player_inWater()) {
        next_state = BS_1_IDLE;
    }
-    if (should_look_first_person_camera()) {
+    if (bainput_should_look_first_person_camera()) {
        next_state = badrone_look();
    }
-    if (should_dive()) {
+    if (bainput_should_dive()) {
        next_state = BS_30_DIVE_ENTER;
    }
    if (func_80294524() && bakey_pressed(BUTTON_A)) {
@ -250,7 +250,7 @@ void func_802B5C40(void) {
            }
        }
    }
-    if (should_dive() != 0) {
+    if (bainput_should_dive() != 0) {
        next_state = BS_30_DIVE_ENTER;
    }
    if (func_80294524() && bakey_pressed(BUTTON_A)) {
--- a/src/core2/bs/timeout.c
+++ b/src/core2/bs/timeout.c
@ -5,7 +5,7 @@
 #include "core2/ba/timer.h"


-void func_80292E80(s32, f32);
+void baeyes_openSingleEye(s32, f32);
 f32 func_8029B41C(void);
 void ncDynamicCamD_func_802BF2C0(f32);

@ -26,14 +26,14 @@ void func_802B6270(void){
 void func_802B6314(void){
    AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
    if(anctrl_isAt(aCtrl, 0.0625f))
-        func_80292E48();
+        baeyes_close();

    if(anctrl_isAt(aCtrl, 0.18f))
        FUNC_8030E624(SFX_3EB_UNKNOWN, 1.0f, 18000);

    if(anctrl_isAt(aCtrl, 0.8421f)){
-        func_80292E80(0, 0.3f);
-        func_80292E80(1, 0.3f);
+        baeyes_openSingleEye(0, 0.3f);
+        baeyes_openSingleEye(1, 0.3f);
    }

    if(anctrl_isAt(aCtrl, 0.84f))
@ -41,7 +41,7 @@ void func_802B6314(void){
 }

 void func_802B63C8(void){
-    func_80292EA4();
+    baeyes_open();
    func_80291548();
    core1_ce60_incOrDecCounter(TRUE);
 }
--- a/src/core2/bs/twirl.c
+++ b/src/core2/bs/twirl.c
@ -32,7 +32,7 @@ void bstwirl_init(void){
    baphysics_set_type(BA_PHYSICS_LOCKED_ROTATION);
    D_8037D5A0 = baphysics_get_target_horizontal_velocity();
    baphysics_set_target_horizontal_velocity(600.0f);
-    func_80299CF4(SFX_32_BANJO_EGHEE, 1.0f, 0x6590);
+    basfx_80299CF4(SFX_32_BANJO_EGHEE, 1.0f, 0x6590);
    _bstwirlHitboxActive = TRUE;
    batimer_set(0, 0.01f);
    D_8037D5A4 = 0;
--- a/src/core2/bs/walk.c
+++ b/src/core2/bs/walk.c
@ -161,7 +161,7 @@ void bswalk_creep_update(void){
    if(func_8028B128())
        next_state = BS_WALK_MUD;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(func_8028B094())
@ -234,7 +234,7 @@ void bswalk_slow_upate(void){
    if(func_8028B128())
        next_state = BS_WALK_MUD;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(func_8028B094())
@ -310,7 +310,7 @@ void bswalk_update(void){
        next_state = BS_SKID;
    }

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(func_8028B094())
@ -385,7 +385,7 @@ void bswalk_fast_update(void){
            if(baphysics_is_slower_than(18.0f))
                next_state = BS_1_IDLE;

-            if(should_look_first_person_camera())
+            if(bainput_should_look_first_person_camera())
                next_state = badrone_look();
            
            break;
@ -394,7 +394,7 @@ void bswalk_fast_update(void){
            if(baphysics_is_slower_than(bsWalkSlowWalkWalkVelocityThreshold))
                next_state = BS_2_WALK_SLOW;

-            if(should_look_first_person_camera())
+            if(bainput_should_look_first_person_camera())
                next_state = badrone_look();

            break;
@ -402,7 +402,7 @@ void bswalk_fast_update(void){
            if(baphysics_is_slower_than(bsWalkWalkFastWalkVelocityThreshold) && func_802B6EF4())
                next_state = BS_WALK;

-            if(should_look_first_person_camera())
+            if(bainput_should_look_first_person_camera())
                next_state = badrone_look();
            break;
    }//L802B7AA4
@ -459,7 +459,7 @@ void bswalk_mud_update(void){
    if(!bastick_getZone())
        next_state = BS_1_IDLE;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(func_8028B094())
--- a/src/core2/bs/walrus.c
+++ b/src/core2/bs/walrus.c
@ -162,7 +162,7 @@ void bswalrus_idle_update(void){
    if(func_8028B094())
        next_state = BS_6A_WALRUS_FALL;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(bastick_getZone() > 0)
@ -390,14 +390,14 @@ static void __bswalrus_recoil_init(s32 damage){
    baphysics_set_vertical_velocity(func_802987C4());
    baphysics_set_gravity(func_802987E4());
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    func_802B8110();
 }

 static void __bswalrus_recoil_update(void){
    enum bs_e next_state = 0;
    if(baanim_isAt(0.5f))
-        func_80292EA4();
+        baeyes_open();
    
    if(player_isStable())
        next_state = BS_67_WALRUS_IDLE;
@ -408,7 +408,7 @@ static void __bswalrus_recoil_update(void){
 static void __bswalrus_recoil_end(void){
    baphysics_reset_gravity();
    baMarker_collisionOn();
-    func_80292EA4();
+    baeyes_open();
    func_802B8048();
 }

@ -470,7 +470,7 @@ void bswalrus_die_init(void){
    func_8025A2FC(0, 0xfa0);
    comusic_playTrack(0x1A);
    baMarker_collisionOff();
-    func_80292E48();
+    baeyes_close();
    batimer_set(0, 1.5f);
    func_802B8110();
    D_8037D5C8 = 0;
@ -513,7 +513,7 @@ void bswalrus_die_end(void){
    pitch_setIdeal(0.0f);
    roll_setIdeal(0.0f);
    func_80291548();
-    func_80292EA4();
+    baeyes_open();
 }

 void bswalrus_drone_init(void){
@ -578,7 +578,7 @@ void bswalrus_sled_update(void){

    func_80299628(0);
    func_802B7F28();
-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        next_state = badrone_look();

    if(bakey_pressed(BUTTON_A))
@ -736,7 +736,7 @@ void bswalrus_timeout_init(void) {
    baMarker_collisionOff();
    batimer_set(0, 2.9f);
    func_802B813C();
-    func_80292E48();
+    baeyes_close();
 }

 void func_802B9830(void) {
@ -751,7 +751,7 @@ void func_802B9880(void) {
    func_80291548();
    core1_ce60_incOrDecCounter(TRUE);
    func_8025A904();
-    func_80292EA4();
+    baeyes_open();
    func_802B80D0();
 }

--- a/src/core2/code_126C0.c
+++ b/src/core2/code_126C0.c
@ -1,235 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-
-/* .data */
-s32 D_80364560 = 0;
-s16 D_80364564[8] = {
-    SFX_32_BANJO_EGHEE,
-    SFX_34_BANJO_AGHOAA,
-    SFX_35_BANJO_WOAH,
-    SFX_37_BANJO_OHWW,
-    SFX_38_BANJO_AYE_1,
-    SFX_39_BANJO_AYE_2,
-    SFX_3A_BANJO_HOUW,
-    SFX_3B_BANJO_GAAH
-};
-
-s16 D_80364574[3] = {
-    SFX_54_BANJO_HOO_1,
-    SFX_55_BANJO_HOO_2,
-    SFX_56_BANJO_HUI,
-};
-
-
-/* .bss */
-u8 D_8037C6C0;
-u8 D_8037C6C1;
-u8 D_8037C6C2;
-u8 D_8037C6C3;
-u8 D_8037C6C4;
-u32 D_8037C6C8;
-f32 D_8037C6CC;
-struct{
-    u8 sfxsourceIdx;
-    f32 unk4;
-    f32 unk8;
-    f32 unkC;
-    f32 unk10;
-    f32 unk14;
-    f32 unk18;
-    f32 unk1C;
-} D_8037C6D0;
-
-/* .code */
-void func_80299650(f32 arg1, f32 arg2){
-    f32 f20;
-    s32 unks0;
-    if(arg2 == 0.0f){
-        func_8030E394(D_8037C6C4);
-    } 
-    else if(arg2 < 1.0) {
-        if(1.0 <= arg1){
-            sfxsource_setSfxId(D_8037C6C4, SFX_1C_ALARMCLOCK);
-            sfxsource_setSampleRate(D_8037C6C4, 0x7fff);
-            func_8030E2C4(D_8037C6C4);
-        }
-    }
-    else{
-        unks0 = 0;
-        f20 = 5.0f;
-        while(f20 > 0.0f){
-            if(f20 <= arg1 && arg2 < f20){
-                sfxsource_setSfxId(D_8037C6C4, (unks0) ? SFX_2A_CLOCK_TIC_1 : SFX_51_CLOCK_TIC_2);
-                sfxsource_setSampleRate(D_8037C6C4, 0x7fff);
-                func_8030E2C4(D_8037C6C4);
-                return;
-            }
-            unks0 ^= 1;
-            f20 -= ml_map_f(f20, 0.0f, 5.0f, 0.1f, 0.25f);
-        }
-    }
-}
-
-void func_802997E8(void){
-    f32 f12;
-    f32 f2;
-    if(D_8037C6D0.sfxsourceIdx){
-        D_8037C6D0.unk4 += time_getDelta();
-        if(D_8037C6D0.unk8 <= D_8037C6D0.unk4){
-            sfxsource_freeSfxsourceByIndex(D_8037C6D0.sfxsourceIdx);
-            D_8037C6D0.sfxsourceIdx = 0;
-        }
-        else{
-            f12 = D_8037C6D0.unk4/D_8037C6D0.unk8;
-            if(f12 < D_8037C6D0.unkC){
-                f2 = ml_map_f(f12, 0.0f, D_8037C6D0.unkC, D_8037C6D0.unk14, D_8037C6D0.unk18);
-            }
-            else if(f12 < D_8037C6D0.unk10){
-                f2 = D_8037C6D0.unk18;
-            }
-            else{
-                f2 = ml_map_f(f12, D_8037C6D0.unk10, 1.0f, D_8037C6D0.unk18, D_8037C6D0.unk1C);
-            }
-            sfxsource_playSfxAtVolume(D_8037C6D0.sfxsourceIdx, f2);
-        }
-    }
-}
-
-void func_802998D0(u8 indx){
-    func_8030E6A4(SFX_19_BANJO_LANDING_08, D_8037C6CC, 22000);
-}
-
-void func_80299900(void){
-    D_8037C6C8 = 0;
-    D_8037C6C0 = sfxsource_createSfxsourceAndReturnIndex();
-    func_8030DD14(D_8037C6C0, 3);
-    func_8030DD90(D_8037C6C0, 0);
-    D_8037C6CC = 1.0f;
-    
-    D_8037C6C1 = sfxsource_createSfxsourceAndReturnIndex();
-    sfxsource_setSfxId(D_8037C6C1, SFX_18_BIGBUTT_SLIDE);
-    func_8030DD54(D_8037C6C1, func_802998D0);
-    sfxsource_setSampleRate(D_8037C6C1, 28000);
-    func_8030DD14(D_8037C6C1, 2);
-    func_8030DD90(D_8037C6C1, 0);
-
-    D_8037C6C2 = sfxsource_createSfxsourceAndReturnIndex();
-    func_8030DD90(D_8037C6C2, 0);
-    
-    D_8037C6C3 = sfxsource_createSfxsourceAndReturnIndex();
-    func_8030DD90(D_8037C6C3, 0);
-
-    D_8037C6C4 = sfxsource_createSfxsourceAndReturnIndex();
-    func_8030DD90(D_8037C6C4, 0);
-    func_8030DD14(D_8037C6C4, 3);
-    D_8037C6D0.sfxsourceIdx = 0;
-}
-
-void func_80299A20(void){
-    sfxsource_freeSfxsourceByIndex(D_8037C6C1);
-    sfxsource_freeSfxsourceByIndex(D_8037C6C0);
-    sfxsource_freeSfxsourceByIndex(D_8037C6C3);
-    sfxsource_freeSfxsourceByIndex(D_8037C6C2);
-    sfxsource_freeSfxsourceByIndex(D_8037C6C4);
-    if(D_8037C6D0.sfxsourceIdx){
-        sfxsource_freeSfxsourceByIndex(D_8037C6D0.sfxsourceIdx);
-    }
-}
-
-void func_80299A8C(void){
-    func_802997E8();
-}
-
-void func_80299AAC(void){
-    D_8037C6CC += randf()*0.1 - 0.05;
-    D_8037C6CC = ml_max_f(D_8037C6CC, 0.9f);
-    D_8037C6CC = ml_min_f(D_8037C6CC, 1.5f);
-    sfxsource_playSfxAtVolume(D_8037C6C1, D_8037C6CC);
-    func_8030E2C4(D_8037C6C1);
-}
-
-void func_80299B58(f32 arg0, f32 arg1){
-    func_80299CF4(D_80364574[D_80364560], randf2(0.93f, 1.09f), 25000);
-    D_80364560++;
-    if(D_80364560 >= 3)
-        D_80364560 = 0;
-}
-
-void func_80299BD4(void){
-    func_8030E5F4(SFX_44_KAZOOIE_AUW, 1.117f);
-}
-
-void func_80299BFC(f32 arg0){
-    sfxsource_setSfxId(D_8037C6C0, D_80364564[D_8037C6C8]);
-    sfxsource_playSfxAtVolume(D_8037C6C0, arg0);
-    func_8030E2C4(D_8037C6C0);
-    ++D_8037C6C8;
-    if(D_8037C6C8 >= 8)
-        D_8037C6C8 = 0;
-}
-
-void func_80299C78(u8 indx, enum sfx_e sfx_id, f32 arg2, s32 arg3){
-    sfxsource_setSfxId(indx, sfx_id);
-    sfxsource_playSfxAtVolume(indx, arg2);
-    sfxsource_setSampleRate(indx, arg3);
-    func_8030E2C4(indx);
-}
-
-u8 func_80299CC4(void){
-    return D_8037C6C2;
-}
-
-void func_80299CD0(void){
-    func_8030E3FC(D_8037C6C2);
-}
-
-void func_80299CF4(enum sfx_e sfx_id, f32 arg1, s32 arg2){
-    func_80299C78(D_8037C6C2, sfx_id, arg1, arg2);
-}
-
-void func_80299D2C(enum sfx_e sfx_id, f32 arg1, s32 arg2){
-    func_80299C78(D_8037C6C3, sfx_id, arg1, arg2);
-}
-
-void func_80299D64(void){
-    if(func_8029CEB0() == 4){
-        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
-        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.8f, 32000);
-    }
-    else{
-        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
-    }
-}
-
-void func_80299DB8(void){
-    if(func_8029CEB0() == 4){
-        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
-    }
-    else{
-        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
-    }
-}
-
-void func_80299E00(void){
-    if(func_8029CEB0() == 4){
-        FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 27000);
-    }
-    else{
-        FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 14000);
-    }
-}
-
-void func_80299E48(void){
-    func_8030E394(D_8037C6C0);
-}
-
-void func_80299E6C(void){
-    func_8030E394(D_8037C6C2);
-}
-
-void func_80299E90(void){
-    func_8030E394(D_8037C6C3);
-}
-
-void func_80299EB4(void){}
--- a/src/core2/code_14420.c
+++ b/src/core2/code_14420.c
@ -835,10 +835,10 @@ s32 func_8029C9C0(s32 arg0){
    if(bakey_pressed(BUTTON_B) && can_claw())
        arg0 = BS_CLAW;

-    if(bakey_held(BUTTON_Z) && should_beak_barge())
+    if(bakey_held(BUTTON_Z) && bainput_should_beak_barge())
        arg0 = BS_BBARGE;

-    if(should_look_first_person_camera())
+    if(bainput_should_look_first_person_camera())
        arg0 = badrone_look();
    
    if(player_isSliding())
--- a/src/core2/code_16010.c
+++ b/src/core2/code_16010.c
@ -28,7 +28,7 @@ void func_8029D01C(void){
 }

 void func_8029D050(void){
-    func_80299E48();
+    basfx_80299E48();
    func_8030E394(D_8037D210);
    sfxsource_setSfxId(D_8037D210, SFX_14D_BANJO_FREEZING);
    sfxsource_setSampleRate(D_8037D210, 30000);
--- a/src/core2/code_90E0.c
+++ b/src/core2/code_90E0.c
@ -2,7 +2,7 @@
 #include "functions.h"
 #include "variables.h"

-extern void func_80292E00(s32, f32);
+extern void baeyes_blinkSingleEye(s32, f32);

 typedef struct {
    f32 unk0;
@ -79,7 +79,7 @@ void func_80290108(void) {

            phi_f20 = mlAbsF(D_8037C000.unk4);
            phi_s0 = &D_8037C000.unk0[D_8037C000.unk8];
-            func_80292E00(phi_s0->unk4, phi_s0->unk8);
+            baeyes_blinkSingleEye(phi_s0->unk4, phi_s0->unk8);
            phi_s0++;
            if (phi_s0->unk4 == 4) {
                if (phi_s0->unk0 == 0.0f) {
--- a/src/core2/code_9450.c
+++ b/src/core2/code_9450.c
@ -17,7 +17,7 @@ u8  D_8037C03E;
 void func_802903E0(void){
    if(D_8037C030 == 0.0f){
        D_8037C030 = 0.09f;
-        func_80299D2C(0x3ED, randf2(0.5f, 0.7f), 6000);
+        basfx_80299D2C(0x3ED, randf2(0.5f, 0.7f), 6000);
    }
 }

--- a/src/core2/code_9BD0.c
+++ b/src/core2/code_9BD0.c
@ -121,25 +121,25 @@ void func_80290F14(void){
    if( !func_80298850() 
        && func_8028ECAC() != 4
        && batimer_get(7) == 0.0f
-        && should_zoom_out_camera()
+        && bainput_should_zoom_out_camera()
    ){
        switch(D_8037C061){
            case 1://L80290FA4
-                func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.0f, 12000);
+                basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.0f, 12000);
                func_80290B60(2);
                break;
            case 2://L80290FBC
                if(D_8037C07C){
-                    func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
+                    basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
                    func_80290B60(3);
                }
                else{
-                    func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
+                    basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
                    func_80290B60(1);
                }
                break;
            case 3://L80291008
-                func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
+                basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
                func_80290B60(1);
                break;
        }
@ -148,20 +148,20 @@ void func_80290F14(void){
 }

 void func_8029103C(void){
-    func_80299EB4();
+    basfx_debug();
 }

 int func_8029105C(s32 arg0){
    if(func_80298850())
        return FALSE;

-    if(should_rotate_camera_left() && ncDynamicCamA_func_802C1DB0(-45.0f)){
+    if(bainput_should_rotate_camera_left() && ncDynamicCamA_func_802C1DB0(-45.0f)){
        func_80291488(arg0);
        func_8029103C();
        return TRUE;
    }
    
-    if(should_rotate_camera_right() && ncDynamicCamA_func_802C1DB0(45.0f)){
+    if(bainput_should_rotate_camera_right() && ncDynamicCamA_func_802C1DB0(45.0f)){
        func_80291488(arg0);
        func_8029103C();
        return TRUE;
--- a/src/core2/code_BD20.c
+++ b/src/core2/code_BD20.c
@ -1,124 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-
-typedef struct{
-    f32 unk0;
-    u8 unk4;
-    u8 pad5[3];
-} struct_BD20; 
-
-/* .bss */
-struct_BD20 D_8037C190[4];
-
-/* .code */
-f32 func_80292CB0(s32 arg0){
-    switch (arg0) {
-        case 0:
-            return func_8029DFC8();
-        case 1:
-            return func_8029DFD4();
-        case 2:
-            return 0.0f;
-        case 3:
-            return 0.0f;
-        default:
-            return 0.0f;
-    }
-}
-
-
-void func_80292D2C(s32 arg0, f32 arg1){
-    switch(arg0){
-        case 0:
-            func_8029E0C4(arg1);
-            break;
-        case 1:
-            func_8029E0D0(arg1);
-            break;
-        case 2:
-            break;
-        case 3:
-        default:
-            break;
-    }
-}
-
-void func_80292D88(void){
-    int i;
-    for(i = 0; i < 4; i++){
-        D_8037C190[i].unk0 = 1.0f;
-        D_8037C190[i].unk4 = 0;
-        func_80292D2C(i, 0.0f);
-    }
-}
-
-void func_80292E00(s32 arg0, f32 arg1){
-    D_8037C190[arg0].unk4 = 1;
-    D_8037C190[arg0].unk0 = arg1;
-}
-
-void func_80292E24(s32 arg0, f32 arg1){
-    D_8037C190[arg0].unk4 = 5;
-    D_8037C190[arg0].unk0 = arg1;
-}
-
-
-void func_80292E48(void){
-    func_80292E24(0, 0.09f);
-    func_80292E24(1, 0.09f);
-}
-
-void func_80292E80(s32 arg0, f32 arg1){
-    D_8037C190[arg0].unk4 = 4;
-    D_8037C190[arg0].unk0 = arg1;
-}
-
-void func_80292EA4(void){
-    func_80292E80(0, 0.034f);
-    func_80292E80(1, 0.034f);
-}
-
-void func_80292EDC(void){
-    f32 temp_f22;
-    f32 temp_f0;
-    int i;
-
-    temp_f22 = time_getDelta();
-    for(i = 0; i < 4; i++){
-        temp_f0 = func_80292CB0(i);
-        switch(D_8037C190[i].unk4){
-            case 1://L80292F78
-                temp_f0 += temp_f22/D_8037C190[i].unk0;
-                if(1.0 < temp_f0){
-                    temp_f0 = 1.0f;
-                    D_8037C190[i].unk4 = 2;
-                }
-                func_80292D2C(i, temp_f0);
-                break; 
-            case 2://L80292FB4
-                D_8037C190[i].unk4 = 3;
-                break; 
-            case 3://L80292FBC
-            case 4://L80292FBC
-                temp_f0 -= temp_f22/D_8037C190[i].unk0;
-                if(temp_f0 < 0.0){
-                    temp_f0 = 0.0f;
-                    D_8037C190[i].unk4 = 0;
-                }
-                func_80292D2C(i, temp_f0);
-                break; 
-            case 5://L80292FF8
-                temp_f0 += temp_f22/D_8037C190[i].unk0;
-                if(1.0 < temp_f0){
-                    temp_f0 = 1.0f;
-                    D_8037C190[i].unk4 = 0;
-                }
-                func_80292D2C(i, temp_f0);
-                break;
-            case 0://L8029302C
-            default://L8029302C
-                break; 
-        }
-    }
-}
--- a/src/core2/code_DF70.c
+++ b/src/core2/code_DF70.c
@ -1,93 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-
-u32 D_8037C300;
-f32 D_8037C304;
-
-int should_beak_barge(void){
-    return bakey_pressed(BUTTON_B) && can_beak_barge();
-}
-
-int should_beak_bust(void){
-    return bakey_pressed(BUTTON_Z) && can_beak_bust();
-}
-
-int should_look_first_person_camera(void){
-    return bakey_pressed(BUTTON_C_UP) && can_view_first_person();
-}
-
-int should_rotate_camera_left(void){
-    return bakey_pressed(BUTTON_C_LEFT) && func_802951FC(0);
-}
-
-int should_rotate_camera_right(void){
-    return bakey_pressed(BUTTON_C_RIGHT) && func_802951FC(1);
-}
-
-int should_zoom_out_camera(void){
-    return bakey_pressed(BUTTON_C_DOWN) && func_802951FC(5);
-}
-
-int should_poop_egg(void){
-    return bakey_pressed(BUTTON_C_DOWN) && can_egg();
-}
-
-int should_shoot_egg(void){
-    return bakey_pressed(BUTTON_C_UP) && can_egg();
-}
-
-int should_feathery_flap(void){
-    return bakey_pressed(BUTTON_A) && can_feathery_flap();
-}
-
-int should_flap_flip(void){
-    return bakey_pressed(BUTTON_A) && can_flap_flip();
-}
-
-int should_peck(void){
-    return bakey_pressed(BUTTON_B) && can_peck();
-}
-
-int should_dive(void){
-    return bakey_pressed(BUTTON_B) && (D_8037C304 == 0.0f) && can_dive();
-}
-
-int func_802951FC(s32 arg0){
-    return D_8037C300  & (1 << arg0);
-}
-
-int should_trot(void){
-    return bakey_pressed(BUTTON_C_LEFT) && can_trot();
-}
-
-int should_wonderwing(void){
-    return bakey_pressed(BUTTON_C_RIGHT) && can_wonderwing();
-}
-
-void func_8029528C(void){
-    D_8037C300 = -1;
-    D_8037C304 = 0.0f;
-}
-
-void func_802952A8(s32 arg0, int arg1){
-    if(arg1)
-        D_8037C300 |= (1 <<arg0);
-    else
-        D_8037C300 &= ~(1 <<arg0);
-}
-
-void func_802952F4(s32 arg0, s32 arg1, int arg2){
-    func_802952A8(arg0, arg2);
-    func_802952A8(arg1, arg2);
-}
-
-void func_80295328(int arg0, f32 arg1){
-    D_8037C304 = arg1;
-}
-
-void func_8029533C(void){
-    if(D_8037C304 != 0.0f){
-       D_8037C304  = ml_max_f(D_8037C304 - time_getDelta(), 0.0f);
-    }
-}
--- a/src/core2/code_E910.c
+++ b/src/core2/code_E910.c
@ -196,7 +196,7 @@ void func_80295914(void){
    func_80291590();
    bakey_reset();
    bastick_reset();
-    func_8029528C();
+    bainput_reset();
    bsList_clearAll();
    bs_clearState();
    func_80295DD0();
@ -212,7 +212,7 @@ void func_80295914(void){
    func_8029CF6C();
    func_8029DFF8();
    func_80290B6C();
-    func_80292D88();
+    baeyes_reset();
    func_80290070();
    func_80290664();
    stateTimer_init();
@ -222,7 +222,7 @@ void func_80295914(void){
    baAnim_init();
    baModel_reset();
    baMarker_init();
-    func_80299900();
+    basfx_reset();
    func_8029A4D0();
    func_8029ADCC();
    func_8029D01C();
@ -265,7 +265,7 @@ void func_80295B04(void){
    baAnim_free();
    func_80293E88();
    bacarry_end();
-    func_80299A20();
+    basfx_free();
    func_8029A54C();
    func_8029ADA8();
    func_8029CFF8();
@ -285,7 +285,7 @@ void func_80295C14(void){
    disableInput_set();
    bakey_update();
    bastick_update();
-    func_8029533C(); //dive_cooldown_update
+    bainput_update(); //dive_cooldown_update
    bs_updateState();
    baphysics_update();
    func_8029858C();
@ -300,7 +300,7 @@ void func_80295C14(void){
    func_80298344(); //climb_cooldown_update
    func_80290108();
    eggShatter_update();
-    func_80292EDC();
+    baeyes_update();
    baModel_update();
    func_8029842C();
    baMarker_update();
@ -316,7 +316,7 @@ void func_80295C14(void){
        D_8037C3B0();
        D_8037C3B0 = NULL;
    }
-    func_80299A8C();
+    basfx_update();
    func_80295E74();//voidOut_update
 }