src/core1: document code_7090.c and code_CE60.c

include/core1/core1.h

@@ -20,12 +20,52 @@
 #include "core1/viewport.h"
 #include "core1/vimgr.h"
 
+
+/* need to sort out in individual header files */
+
 void mlMtx_apply_vec3f(f32[3], f32[3]);
 void func_80252C08(f32 arg0[3], f32 arg1[3], f32 scale, f32 arg3[3]);
 void glcrc_calc_checksum(void *start, void *end, u32 checksum[2]);
 f32 ml_cos_deg(f32);
 f32 ml_sin_deg(f32);
 
+void func_80250530(s32 arg0, u16 chan_mask, f32 arg2);
+int func_802585E0(s32 vec[3], s32 minX, s32 minY, s32 minZ, s32 maxX, s32 maxY, s32 maxZ);
+
+void func_8025A104(enum comusic_e arg0, s32 arg1);
+void func_8025A55C(s32 arg0, s32 arg1, s32 arg2);
+s32 func_8025A864(enum comusic_e track_id);
+void func_8025ABB8(enum comusic_e comusic_id, s32 arg1, s32 arg2, s32 arg3);
+int func_8025AD7C(enum comusic_e arg0);
+int func_8025ADBC(enum comusic_e arg0);
+
+
+/* src/core1/code_7090.c */
+
+void core1_7090_alloc(void);
+void core1_7090_release(void);
+void core1_7090_initSfxSource(s32 idx, s32 lookup_idx, s32 sample_rate, f32 volume);
+void core1_7090_freeSfxSource(int idx);
+
+
+/* src/core1/code_CE60.c */
+
+void core1_ce60_setChanMask(s32 chan_mask);
+void core1_ce60_setChanMaskWithValue(s32 chan_mask, f32 arg1);
+bool core1_ce60_isPlayerInRange(s32 x, s32 z, s32 distance);
+f32 core1_ce60_getPlayerDistance(f32 x, f32 z);
+bool core1_ce60_isPlayerInsideBoundingBox(s32 box_idx);
+void core1_ce60_func_8024A9EC(s32 arg0);
+void core1_ce60_func_8024AAB0(void);
+void core1_ce60_func_8024ADF0(bool arg0);
+void core1_ce60_func_8024AE74(void);
+void core1_ce60_resetState(void);
+void core1_ce60_setChanMaskFromWaterState(s32 chan_mask_underwater, s32 chan_mask_surface);
+void core1_ce60_func_8024AF48(void);
+void core1_ce60_incOrDecCounter(bool increment);
+void core1_ce60_func_8024BD40(s32 arg0, s32 arg1);
+
+
 
 /* src/core1/depthbuffer.c */
 

include/core2/core2.h

@@ -12,4 +12,7 @@ void func_8035179C_copyPosition(Struct68s* arg0, f32 arg1[3]);
 void func_80351814(Struct68s *arg0, f32 arg1[3]);
 f32  func_80351830(Struct68s *arg0);
 
+
+extern void sfxsource_setSampleRate(u8, s32);
+
 #endif

src/FP/ch/bearcub.c

@@ -84,7 +84,7 @@ void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
         func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
         func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
         func_8025A58C(0, 4000);
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
     }
 }
 

src/FP/ch/boggy2.c

@@ -201,7 +201,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
         case 0xc29://L80388DC4
             func_8025A6EC(COMUSIC_3A_FP_BOGGY_RACE, 25000);
             func_8025A58C(0, 4000);
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             func_802BE720();
             local->unk0 = partEmitMgr_newEmitter(16);
             local->unk4 = partEmitMgr_newEmitter(16);

src/FP/ch/twinklybox.c

@@ -199,7 +199,7 @@ void func_8038D3D8(void){
     comusic_8025AB44(COMUSIC_68_TWINKLY_MINIGAME, 0, 4000);
     func_8025AABC(COMUSIC_68_TWINKLY_MINIGAME);
     func_8025A58C(-1, 4000);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_8038D41C(ActorMarker *marker){
@@ -265,7 +265,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
         this->unk1C[1] = 0.0f;
         func_8025A6EC(COMUSIC_68_TWINKLY_MINIGAME, 25000);
         func_8025A58C(0, 4000);
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
         this->unk1C[2] = 428571.0f;
         func_8025AEA0(0x68, (s32)this->unk1C[2]);
         subaddie_set_state_with_direction(this, 3, 0.001f, 1);

src/FP/racectrl.c

@@ -69,7 +69,7 @@ void func_8038ABDC(void){
     comusic_8025AB44(COMUSIC_3A_FP_BOGGY_RACE, 0, 4000);
     func_8025AABC(COMUSIC_3A_FP_BOGGY_RACE);
     func_8025A58C(-1, 4000);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_8038AC20(s32 gate_indx, s32 arg1){

src/GV/ch/ancientone.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "variables.h"
 
-extern void func_80244BB0(s32, s32, s32, f32);
+extern void core1_7090_initSfxSource(s32, s32, s32, f32);
 
 typedef struct {
     f32 unk0[3];
@@ -75,13 +75,13 @@ void func_80386620(Actor *this){
 }
 
 void func_8038678C(void){
-    func_80244BB0(3, 0x85, 0x7ff8, 1.0f);
+    core1_7090_initSfxSource(3, 0x85, 0x7ff8, 1.0f);
-    func_80244BB0(4, 0x85, 0x7ff8, 1.0f);
+    core1_7090_initSfxSource(4, 0x85, 0x7ff8, 1.0f);
 }
 
 void func_803867CC(void){
-    func_80244C78(3);
+    core1_7090_freeSfxSource(3);
-    func_80244C78(4);
+    core1_7090_freeSfxSource(4);
 }
 
 void func_803867F4(void){
@@ -167,7 +167,7 @@ void chAncientOne_update(Actor *this){
                                 if(this->unkF4_8 < 5){
                                     D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
                                     func_802BAFE4(GV_D_80390C20[this->unkF4_8 - 1]);
-                                    func_80244BB0(2, 0x86, 0x7ff8, 0.3f);
+                                    core1_7090_initSfxSource(2, 0x86, 0x7ff8, 0.3f);
                                     timedFunc_set_0(0.45f, func_8038678C);
                                 
                                 }//L80386DB0
@@ -190,7 +190,7 @@ void chAncientOne_update(Actor *this){
                         }//L80386D80
                     }
                     if(LOCAL_CH_ANCIENT_ONE(this)->unk1C <= this->position_y){
-                        func_80244C78(2);
+                        core1_7090_freeSfxSource(2);
                         timedFunc_set_0(0.5f, func_803867CC);
                     }
                 }//L80386DB0 

src/GV/code_7FF0.c

@@ -4,7 +4,7 @@
 #include "variables.h"
 #include "actor.h"
 
-extern void func_80244BB0(s32, s32, s32, f32);
+extern void core1_7090_initSfxSource(s32, s32, s32, f32);
 extern void func_802D3D54(Actor *this);
 extern void func_802D3D74(Actor *this);
 extern Actor *func_80325F2C(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -231,7 +231,7 @@ void func_8038E648(Actor *this){
                 func_802BAFE4(2);
                 subaddie_set_state(this, 6);
                 this->unk38_31 = 600;
-                func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
+                core1_7090_initSfxSource(0, 0x6A, 0x7ff8, 0.3f);
                 func_802D68F0(25);
                 item_set(ITEM_6_HOURGLASS, 1);
             }
@@ -243,7 +243,7 @@ void func_8038E648(Actor *this){
                 subaddie_set_state(this, 7);
                 this->pitch = 90.0f;
                 func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
-                func_80244C78(0);
+                core1_7090_freeSfxSource(0);
             }
             break;
 
@@ -251,7 +251,7 @@ void func_8038E648(Actor *this){
             this->unk38_31 -= time_getDelta();
             if(this->unk38_31 == 0){
                 subaddie_set_state(this, 8);
-                func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
+                core1_7090_initSfxSource(0, 0x6A, 0x7ff8, 0.3f);
             }
             break;
 
@@ -262,7 +262,7 @@ void func_8038E648(Actor *this){
                 this->pitch = 0.0f;
                 func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
                 mapSpecificFlags_set(5, FALSE);
-                func_80244C78(0);
+                core1_7090_freeSfxSource(0);
                 volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED);
             }
             break;
@@ -296,7 +296,7 @@ void func_8038E97C(Actor *this){
             this->position_y += 130.0;
             this->unk38_31 = 30;
             subaddie_set_state(this, 8);
-            func_80244BB0(1, 0x6A, 0x7ff8, 0.3f);
+            core1_7090_initSfxSource(1, 0x6A, 0x7ff8, 0.3f);
         }
     }//L8038EA6C
 
@@ -314,7 +314,7 @@ void func_8038E97C(Actor *this){
         this->unk38_31 -= 1;
         if(this->unk38_31 == 0){
             subaddie_set_state(this, 1);
-            func_80244C78(1);
+            core1_7090_freeSfxSource(1);
             func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
         }
 
@@ -330,7 +330,7 @@ void chKazooieDoor_update(Actor *this){
                 func_8025A6EC(COMUSIC_2B_DING_B, -1);
                 func_802BAFE4(3);
                 subaddie_set_state(this, 6);
-                func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
+                core1_7090_initSfxSource(1, 0x6a, 0x7ff8, 0.3f);
                 this->unk1C[1] = this->position_y + 210.0f;
                 this->unk1C[0] = this->position_y;
             }
@@ -342,7 +342,7 @@ void chKazooieDoor_update(Actor *this){
             if(this->unk1C[1] <= this->position_y){
                 subaddie_set_state(this, 7);
                 func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
-                func_80244C78(1);
+                core1_7090_freeSfxSource(1);
                 this->unk38_31 = 450;
             }
             break;
@@ -351,7 +351,7 @@ void chKazooieDoor_update(Actor *this){
             this->unk38_31--;
             if(this->unk38_31 == 0){
                 subaddie_set_state(this, 8);
-                func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
+                core1_7090_initSfxSource(1, 0x6a, 0x7ff8, 0.3f);
             }
             break;
 
@@ -362,7 +362,7 @@ void chKazooieDoor_update(Actor *this){
                 this->position_y = this->unk1C[0];
                 subaddie_set_state(this, 1);
                 func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
-                func_80244C78(1);
+                core1_7090_freeSfxSource(1);
                 mapSpecificFlags_set(6, FALSE);
             }
             break;

src/MM/ch/chimpystump.c

@@ -8,7 +8,7 @@
 /* external function declarations */
 void func_80353064(f32 *, f32);
 void func_802BB3DC(s32, f32, f32);
-void func_80244BB0(s32, s32, s32, f32);
+void core1_7090_initSfxSource(s32, s32, s32, f32);
 
 /* public function declarations */
 void chchimpystump_update(Actor *this);
@@ -33,7 +33,7 @@ void __chchimpystump_updateShaking(Actor *this) {
         if (this->unk10_12 == 0) {
             this->unk10_12 = 1;
             func_802BB3DC(1, 3.0f, 1.0f);
-            func_80244BB0(0, 0x6A, 0x7FF8, 0.2f);
+            core1_7090_initSfxSource(0, 0x6A, 0x7FF8, 0.2f);
         }//L80386D0C
 
         this->position_x = ((globalTimer_getTime() & 1) * 2) ^ (s32) this->position_x;
@@ -67,7 +67,7 @@ void chchimpystump_update(Actor *this) {
                 this->position_y = this->actor_specific_1_f;
                 subaddie_set_state(this, CHIMPY_STUMP_STATE_3_RAISED);
                 func_802BB41C(1);
-                func_80244C78(0);
+                core1_7090_freeSfxSource(0);
             }
 
             if ((globalTimer_getTime() & 3) == 2) {

src/MMM/code_2040.c

@@ -33,7 +33,7 @@ extern ActorInfo D_8038BEFC;
 extern ActorInfo D_80367E70;
 extern ActorInfo D_80372C3C;
 
-extern void func_80244BB0(s32, s32, s32, f32);
+extern void core1_7090_initSfxSource(s32, s32, s32, f32);
 extern void func_8025AE0C(s32, f32);
 extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32);
 extern void *func_80309B48(f32[3], f32[3], f32[3], u32);
@@ -307,7 +307,7 @@ void func_80388BDC(Actor *this) {
         if(mapSpecificFlags_get(MMM_SPECIFIC_FLAG_0_UNKNOWN)) {
             func_802BAFE4(0x21);
             subaddie_set_state(this, 6);
-            func_80244BB0(0, 0x6A, 0x7FF8, 0.3f);
+            core1_7090_initSfxSource(0, 0x6A, 0x7FF8, 0.3f);
             mapSpecificFlags_set(MMM_SPECIFIC_FLAG_2_UNKNOWN, FALSE);
             func_8025A6EC(COMUSIC_4_MMM_CLOCK_VERSION, -1);
             func_8025AE0C(2000, 3.0f);
@@ -320,7 +320,7 @@ void func_80388BDC(Actor *this) {
             subaddie_set_state(this, 7U);
             this->yaw = 270.0f;
             func_8030E540(0x7F);
-            func_80244C78(0);
+            core1_7090_freeSfxSource(0);
             func_802D68F0(0xE);
             item_set(6, 1);
         }
@@ -341,7 +341,7 @@ void func_80388BDC(Actor *this) {
                 func_802BAFE4(0x23);
             }
             subaddie_set_state(this, 8);
-            func_80244BB0(0, 0x6A, 0x7FF8, 0.3f);
+            core1_7090_initSfxSource(0, 0x6A, 0x7FF8, 0.3f);
         }
         break;
     case 8:
@@ -351,7 +351,7 @@ void func_80388BDC(Actor *this) {
             this->yaw = 0.0f;
             func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
             mapSpecificFlags_set(MMM_SPECIFIC_FLAG_0_UNKNOWN, FALSE);
-            func_80244C78(0);
+            core1_7090_freeSfxSource(0);
             if (!this->unk38_31) {
                 func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 0x7FF8);
                 func_8025AE0C(0x7D0, 2.5f);

src/TTC/ch/nipper.c

@@ -213,13 +213,13 @@ static void __chNipper_updateFunc(Actor *this){
         if(0.0f == this->velocity_x && xVelocity){
             comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 5000);
             func_8032BB88(this, 0, 4000);
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
         }
         else if(!xVelocity && 0.0f != this->velocity_x){
             comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
             func_8025AABC(COMUSIC_12_TTC_NIPPER);
             func_8032BB88(this, -1, 300);
-            func_8024BD08(1);
+            core1_ce60_incOrDecCounter(TRUE);
         }
         this->velocity_x = xVelocity;
     }

src/core1/code_11AC0.c

@@ -24,7 +24,6 @@ u8 func_8025F4A0(ALCSPlayer *, u8);
 
 void func_8025F3F0(ALCSPlayer *, f32, f32);
 u16 func_80250474(s32 arg0);
-void func_8024AF48(void);
 void func_8024FB8C(void);
 
 /* .data */
@@ -603,7 +602,7 @@ u16 func_80250474(s32 arg0){
         D_80282110[i].unk10 = -1.0f;
     }
     osSetIntMask(sp1C);
-    func_8024AF48();
+    core1_ce60_func_8024AF48();
     if(D_802762C0 == -1){
         D_802762C0 = 0xFFFF;
     }

src/core1/code_7090.c

@@ -3,69 +3,60 @@
 #include "functions.h"
 #include "variables.h"
 
-extern void sfxsource_setSampleRate(u8, s32);
+s16 *D_802758E0 = NULL;
-extern void func_8030E2C4(u8);
 
-
+void core1_7090_alloc(void) {
-typedef struct struct_27_s{
-    s16 unk0;
-    u8 pad2[0x12];
-}struct27s;
-
-s16 * D_802758E0 = NULL;
-
-void func_80244C78(int arg0);
-
-/* .code */
-void func_80244AB0(void){
     int i;
-    if(D_802758E0)
+
+    if (D_802758E0)
         return;
 
-    D_802758E0 = (struct16s *) malloc(10*sizeof(s16));
+    D_802758E0 = (s16 *) malloc(10 * sizeof(s16));
-    for(i = 0; i < 10; i++){
+
+    for (i = 0; i < 10; i++) {
         D_802758E0[i] = 0;
     }
 }
 
-void func_80244B3C(void){
+void core1_7090_release(void) {
     int i;
 
-    if(!D_802758E0)
+    if (!D_802758E0)
         return;
 
-    for(i = 0; i < 10; i++){
+    for (i = 0; i < 10; i++) {
-        if(D_802758E0[i])
+        if (D_802758E0[i])
-            func_8030E394((u8)D_802758E0[i]);
+            func_8030E394(D_802758E0[i]);
     }
+
     free(D_802758E0);
     D_802758E0 = NULL;
-
 }
 
-void func_80244BB0(s32 arg0, s32 arg1, s32 arg2, f32 arg3){
+void core1_7090_initSfxSource(s32 idx, s32 lookup_idx, s32 sample_rate, f32 volume) {
-    s32 i;
+    u8 sfx_source_index;
-    u8 indx;
+
-    if(func_8030ED70(lookup_getSfxId(arg1))){
+    if (func_8030ED70(lookup_getSfxId(lookup_idx))) {
-        i = sfxsource_createSfxsourceAndReturnIndex();
+        sfx_source_index = sfxsource_createSfxsourceAndReturnIndex();
-        indx = i;
+
-        if(i){
+        if (sfx_source_index) {
-            sfxsource_setSfxId(indx, lookup_getSfxId(arg1));
+            sfxsource_setSfxId(sfx_source_index, lookup_getSfxId(lookup_idx));
-            sfxsource_playSfxAtVolume(indx, arg3);
+            sfxsource_playSfxAtVolume(sfx_source_index, volume);
-            sfxsource_setSampleRate(indx, arg2);
+            sfxsource_setSampleRate(sfx_source_index, sample_rate);
-            func_8030E2C4(indx);
+            func_8030E2C4(sfx_source_index);
-            func_80244C78(arg0);
+            core1_7090_freeSfxSource(idx);
-            D_802758E0[arg0] = indx;
+            D_802758E0[idx] = sfx_source_index;
         }
     }
-    else{
+    else {
-        func_8030E6A4(lookup_getSfxId(arg1), arg3, arg2);
+        func_8030E6A4(lookup_getSfxId(lookup_idx), volume, sample_rate);
     }
 }
 
-void func_80244C78(int arg0){
+void core1_7090_freeSfxSource(int idx) {
-    if(D_802758E0[arg0]){
+    if (D_802758E0[idx]) {
-        func_8030DA44(D_802758E0[arg0]);
+        func_8030DA44(D_802758E0[idx]);
     }
-    D_802758E0[arg0] = 0;
+
+    D_802758E0[idx] = 0;
 }

src/core2/bs/ant.c

@@ -440,7 +440,7 @@ void bsant_die_update(void){
 }
 
 void bsant_die_end(void){
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     pitch_setIdeal(0.0f);
     roll_setIdeal(0.0f);

src/core2/bs/bSwim.c

@@ -464,7 +464,7 @@ void func_802A8098(void) {
 void func_802A82D4(void) {
     func_802906A4(1);
     func_80291548();
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baMarker_collisionOn();
     if (bs_getNextState() != BS_5A_LOADZONE) {
         func_80346CE8();

src/core2/bs/bWhirl.c

@@ -39,7 +39,7 @@ static void __bsbwhirl_end(void){
         func_8029B0C0();
         func_8029E070(0);
         func_8025A55C(-1, 0xfa0, 0xd);
-        func_8024BD08(1);
+        core1_ce60_incOrDecCounter(TRUE);
         func_8025A7DC(COMUSIC_25_USING_GOLD_FEATHERS);
     }  
     baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -86,7 +86,7 @@ void bsbwhirl_enter_init(void){
     func_8029B324(1, 1.0f);
     func_8029E070(1);
     D_8037D3B0 = 0.0f;
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     func_8025A55C(0, 0xfa0, 0xd);
     func_8025A6EC(0x25, 0x6d60);
     func_80299BD4();

src/core2/bs/beeMain.c

@@ -469,7 +469,7 @@ void func_802A1DD8(void){
 }
 
 void func_802A1F2C(void){
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     func_80291548();
     func_80292EA4();
@@ -508,7 +508,7 @@ void func_802A2014(void){
 void func_802A2054(void){
     baMarker_collisionOn();
     func_8025A2FC(-1, 0xFA0);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
     func_80291548();
     func_80298A64();
 }
@@ -519,7 +519,7 @@ void func_802A2098(void){
     yaw_setIdeal(func_8029B41C());
     func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
     baphysics_set_target_horizontal_velocity(0.0f);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     func_8025A2FC(0, 0xFA0);
     func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE, -1);
     func_8029151C(0xC);

src/core2/bs/croc.c

@@ -490,7 +490,7 @@ void bscroc_die_update(void){
 }
 
 void bscroc_die_end(void){
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     pitch_setIdeal(0.0f);
     roll_setIdeal(0.0f);

src/core2/bs/die.c

@@ -124,7 +124,7 @@ void bsdie_update(void){
 }
 
 void bsdie_end(void){
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     func_8029E070(0);
     pitch_setIdeal(0.0f);

src/core2/bs/jig.c

@@ -32,7 +32,7 @@ void bsjig_jiggy_init(void){
     yaw_setIdeal(func_8029B41C()); //face camera
     func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
     baphysics_set_target_horizontal_velocity(0.0f);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     func_8025A2FC(0,0xfa0);
     tmp = (item_getCount(ITEM_E_JIGGY) == 9); 
     if(tmp == 0) //weird if...
@@ -106,7 +106,7 @@ void bsjig_jiggy_end(void){
 
     if(bs_getNextState() != BS_34_JIG_NOTEDOOR){
         func_8025A2FC(-1, 0xfa0);
-        func_8024BD08(1);
+        core1_ce60_incOrDecCounter(TRUE);
     }
     baMarker_collisionOn();
     if( jiggyscore_total() == 100 
@@ -148,7 +148,7 @@ void bsjig_jiggy_interrupt(void){
 void bsjig_notedoor_end(void){
     baMarker_collisionOn();
     func_8025A2FC(-1, 0xfa0);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
     func_8029E070(0);
     func_80291548();
     if( D_8037D4B2 
@@ -174,7 +174,7 @@ void bsjig_notedoor_init(void){
     func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
     baphysics_set_target_horizontal_velocity(0.0f);
     if(bs_getPrevState() != BS_44_JIG_JIGGY){
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
         func_8025A2FC(0,0xfa0);
     }
     func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE,-1);

src/core2/bs/pumpkin.c

@@ -524,7 +524,7 @@ void bspumpkin_die_update(void){
 
 void bspumpkin_die_end(void) {
     func_802B229C();
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     pitch_setIdeal(0.0f);
     roll_setIdeal(0.0f);

src/core2/bs/timeout.c

@@ -17,7 +17,7 @@ void func_802B6270(void){
     ncDynamicCamD_func_802BF2C0(80.0f);
     func_8025A58C(0,0xfa0);
     comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     func_8029E070(1);
     baMarker_collisionOff();
 }
@@ -42,7 +42,7 @@ void func_802B6314(void){
 void func_802B63C8(void){
     func_80292EA4();
     func_80291548();
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_802B63F8(void){
@@ -58,7 +58,7 @@ void func_802B63F8(void){
     ncDynamicCamD_func_802BF2C0(80.0f);
     func_8025A58C(0,0xfa0);
     comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baMarker_collisionOff();
     func_8029E3C0(0, 2.9f);
 }
@@ -71,6 +71,6 @@ void func_802B64D0(void){
 void func_802B6500(void){
     func_8029E070(0);
     func_80291548();
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
     func_8025A904();
 }

src/core2/bs/walrus.c

@@ -508,7 +508,7 @@ void bswalrus_die_update(void){
 }
 
 void bswalrus_die_end(void){
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baphysics_reset_gravity();
     pitch_setIdeal(0.0f);
     roll_setIdeal(0.0f);
@@ -732,7 +732,7 @@ void bswalrus_timeout_init(void) {
     ncDynamicCamD_func_802BF2C0(60.0f);
     func_8025A58C(0, 4000);
     comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     baMarker_collisionOff();
     func_8029E3C0(0, 2.9f);
     func_802B813C();
@@ -749,7 +749,7 @@ void func_802B9830(void) {
 
 void func_802B9880(void) {
     func_80291548();
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
     func_8025A904();
     func_80292EA4();
     func_802B80D0();

src/core2/ch/jinjo.c

@@ -173,7 +173,7 @@ void chJinjo_update(Actor * this){
                     sp40[1] += 50.0f;
                     jiggy_spawn(10*level_get()-9, sp40);
                 }//L802CE0CC
-                func_8024BD08(0);
+                core1_ce60_incOrDecCounter(FALSE);
                 func_8032BB88(this, 0, 4000);
                 if(local->unk4){
                     func_8025A6EC(COMUSIC_30_5TH_JINJO_COLLECTED, 28000);
@@ -248,7 +248,7 @@ void chJinjo_update(Actor * this){
                     func_80326310(this);
                     if(local->unk4 == 0){
                         func_8032BB88(this, -1, 4000);
-                        func_8024BD08(1);
+                        core1_ce60_incOrDecCounter(TRUE);
                     }
                 }//L802CE518
 
@@ -263,7 +263,7 @@ void chJinjo_update(Actor * this){
 
                 if(local->unk4 && actor_animationIsAt(this,0.95f)){
                     func_8032BB88(this, -1, 4000);
-                    func_8024BD08(1);
+                    core1_ce60_incOrDecCounter(TRUE);
                 }
             }//L802CE598
 

src/core2/ch/snacker.c

@@ -374,10 +374,10 @@ void chSnacker_spawn(void) {
     }
     if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) == 0) {
         func_8032BB88(snacker, 5000, 750);
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
         func_8025A6EC(COMUSIC_34_SNACKER_DANGER, 0);
         comusic_8025AB44(COMUSIC_34_SNACKER_DANGER, 0x7FFF, 750);
-        func_8024BD08(1);
+        core1_ce60_incOrDecCounter(TRUE);
     }
     s_chSnacker_spawnTimer = 0.0f;
     func_8032CA80(snacker, s_chSnacker_inRbb ? 15 : 9);

src/core2/code_14420.c

@@ -823,7 +823,7 @@ void func_8029C984(void){
     func_8025AB00();
     func_8025A2FC(0, 4000);
     comusic_playTrack(COMUSIC_1A_DEATH);
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
 }
 
 s32 func_8029C9C0(s32 arg0){
@@ -885,7 +885,7 @@ void func_8029CB84(void){
 
 void func_8029CBC4(void){
     func_8025A55C(-1, 4000, 0xc);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_8029CBF4(void){
@@ -920,7 +920,7 @@ void func_8029CCC4(void){
     if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){
         func_8028F918(2);
     }
-    func_8024BD08(0);
+    core1_ce60_incOrDecCounter(FALSE);
     func_8025A55C(0, 4000, 0xC);
     func_8025A6EC(COMUSIC_D_JINGLE_JIGGY_COLLECTED, -1);
     timedFunc_set_0(4.0f, func_8029CBF4);

src/core2/code_85800.c

@@ -458,7 +458,7 @@ void func_8030D778(void){
 
 void func_8030D86C(void){
     func_8030D750();
-    func_80244AB0();
+    core1_7090_alloc();
     func_8030EDAC(0.0f, 1.0f);
 }
 
@@ -472,7 +472,7 @@ void func_8030D8B4(void){
 }
 
 void func_8030D8DC(void){
-    func_80244B3C();
+    core1_7090_release();
     func_8030D778();
     func_8030D8B4();
 }

src/core2/code_956B0.c

@@ -128,7 +128,7 @@ void func_8031CB50(enum map_e map_id, s32 exit_id, s32 arg2) {
         if ((func_803226E8(map_id) != sp1C) && (func_80322914() == 0)) {
             func_8025A388(0, 0x4E2);
             func_8025AB00();
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
         }
         if (func_802E4A08()) {
             func_802E40D0(map_id, exit_id);
@@ -287,7 +287,7 @@ void warp_gvEnterWaterPyramidLower(s32 arg0, s32 arg1) {
 
 void warp_gvEnterRubeePyramid(s32 arg0, s32 arg1) {
     item_set(ITEM_6_HOURGLASS, 0);
-    func_80244C78(1);
+    core1_7090_freeSfxSource(1);
     func_8031CC8C(arg0, 0x1607);
 }
 
@@ -297,7 +297,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) {
 }
 
 void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) {
-    func_80244C78(0);
+    core1_7090_freeSfxSource(0);
     volatileFlag_set(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, 1);
     func_8031CC8C(arg0, 0x1502);
 }
@@ -536,7 +536,7 @@ void func_8031DAA8(enum map_e arg0, s32 arg1) {
 void func_8031DAE0(s32 arg0, s32 arg1) {
     if (mapSpecificFlags_get(2) == 0) {
         volatileFlag_set(VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, 1);
-        func_80244C78(0);
+        core1_7090_freeSfxSource(0);
         mapSpecificFlags_set(2, 1);
         func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60);
         func_8028F918(1);

src/core2/code_9A9D0.c

@@ -34,12 +34,12 @@ void func_803219F4(s32 arg0){
     switch(D_80383310){
         case 2: //L80321A30
             func_8025A55C(-1, 4000, 7);
-            func_8024BD08(1);
+            core1_ce60_incOrDecCounter(TRUE);
             comusic_8025AB44(COMUSIC_58_WADING_BOOTS, 0, 4000);
             func_8025AABC(COMUSIC_58_WADING_BOOTS);
             break;
         case 4: //L80321A6C
-            func_8024BD08(1);
+            core1_ce60_incOrDecCounter(TRUE);
             if(D_80383314 == COMUSIC_57_TURBO_TRAINERS){
                 func_8025A55C(-1, 4000, 7);
             }
@@ -48,7 +48,7 @@ void func_803219F4(s32 arg0){
             break;
         case 3: //L80321AC0
             func_8025A55C(-1, 4000, 7);
-            func_8024BD08(1);
+            core1_ce60_incOrDecCounter(TRUE);
             comusic_8025AB44(COMUSIC_95_BBONUS_A, 0, 4000);
             func_8025AABC(COMUSIC_95_BBONUS_A);
             break;
@@ -60,7 +60,7 @@ void func_803219F4(s32 arg0){
 
     switch(D_80383310){
         case 2: //L80321B28
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             func_8025A55C(0, 4000, 7);
             func_8025A6EC(COMUSIC_58_WADING_BOOTS, -1);
             func_8025A8B8(COMUSIC_58_WADING_BOOTS, 1);
@@ -72,7 +72,7 @@ void func_803219F4(s32 arg0){
             else{
                 D_80383314 = COMUSIC_57_TURBO_TRAINERS;
             }
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             if(D_80383314 == COMUSIC_57_TURBO_TRAINERS){
                 func_8025A55C(0, 4000, 7);
             }
@@ -81,7 +81,7 @@ void func_803219F4(s32 arg0){
             break;
         case 3: //L80321BDC
             func_803228D8();
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             func_8025A55C(0, 4000, 7);
             func_8025A6EC(COMUSIC_95_BBONUS_A, -1);
             func_8025A8B8(COMUSIC_95_BBONUS_A, 1);

src/core2/code_9B650.c

@@ -233,13 +233,13 @@ void func_8032278C(s32 arg0, s32 arg1) {
         D_8036E2B4 = 0;
         if (D_80383348 == 0) {
             if ((temp_v0 & 1) != 0) {
-                func_8024ADF0(0);
+                core1_ce60_func_8024ADF0(FALSE);
             } else {
-                func_8024ADF0(1);
+                core1_ce60_func_8024ADF0(TRUE);
             }
         } else {
             D_80383348 = 0;
-            func_8024BD08(1);
+            core1_ce60_incOrDecCounter(TRUE);
         }
     }
     if ((arg0 == 1) && (arg1 == 2)) {
@@ -253,7 +253,7 @@ void func_8032278C(s32 arg0, s32 arg1) {
 
 void func_803228D8(void){
     if(!D_80383348){
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
         D_80383348 = TRUE;
     }
 }

src/core2/code_9C170.c

@@ -7,20 +7,20 @@ u8 D_80383370;
 
 /* .code */
 void func_80323100(void){
-    func_8024AED8();
+    core1_ce60_resetState();
 }
 
 void func_80323120(void){
-    func_8024AE74();
+    core1_ce60_func_8024AE74();
 }
 
 void func_80323140(s32 arg0, s32 arg1){
-    func_8024BD40(arg0, arg1);
+    core1_ce60_func_8024BD40(arg0, arg1);
     func_8032278C(arg0, arg1);
 }
 
 void func_80323170(void){
-    func_8024AF48();
+    core1_ce60_func_8024AF48();
 }
 
 void func_80323190(void){

src/core2/code_ABC00.c

@@ -142,7 +142,7 @@ s32 s_jiggylist_current_index;
 
 /* .code */
 void func_80332B90(void){
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_80332BB0(void) {
@@ -245,7 +245,7 @@ void jiggy_spawn(enum jiggy_e jiggy_id, f32 pos[3]) {
         temp_v0->init(&temp_v0->unk10);
         jiggyscore_setSpawned(jiggy_id, TRUE);
         if (!jiggyscore_isCollected(jiggy_id) && (jiggy_id != JIGGY_3E_GV_GRABBA) && (jiggy_id != JIGGY_0B_TTC_JINJO)) {
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             func_8025A55C(0, 4000, 5);
             func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
             timedFunc_set_0(3.5f, func_80332BB0);

src/core2/code_AD5B0.c

@@ -181,7 +181,7 @@ void func_80334910(void) {
     if (func_80322914() == 0) {
         func_8024F7C4(func_803226E8(D_803835D0.map_4));
     }
-    func_80244B3C();
+    core1_7090_release();
     AnimTextureListCache_free();
     func_80322FDC();
     func_8033BD6C();
@@ -197,7 +197,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
     func_80335110(1);
     func_80335128(1);
     func_802D2CB8();
-    func_80244AB0();
+    core1_7090_alloc();
     if (map_get() == MAP_8E_GL_FURNACE_FUN) {
         func_8038E7C4();
     }

src/core2/code_B9770.c

@@ -2,7 +2,6 @@
 #include "functions.h"
 #include "variables.h"
 
-extern void func_80250530(s32, u16, f32);
 extern void sfxsource_setSampleRate(u8, s32);
 extern bool func_80323240(struct56s *, f32, f32[3]);
 extern f32  func_803234FC(struct56s *, f32, f32);

src/lair/code_5ED0.c

@@ -67,8 +67,6 @@ extern s32  ability_getAllLearned(void); // get unlocked moves bitfield
 extern s32  item_getCount(s32); // item count get
 extern void item_adjustByDiffWithoutHud(s32, s32); // item count set
 
-extern void func_80250530(s32, u16, f32);
-
 extern void func_8025A55C(s32, s32, s32);
 
 extern void func_80324CFC(f32, s16, s16);