diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c
index d8bf2d4c..aed2229f 100644
--- a/src/BGS/ch/code_2270.c
+++ b/src/BGS/ch/code_2270.c
@@ -147,14 +147,14 @@ void chTiptup_setState(Actor *this, s32 arg1){
             this->has_met_before = TRUE;
 
             if (unqPtr->unkA == 0) {
-                gcdialog_showText(ASSET_C72_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388784, 0);
+                gcdialog_showText(ASSET_C72_TEXT_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
             }
             else {
-                gcdialog_showText(ASSET_C74_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388784, 0);
+                gcdialog_showText(ASSET_C74_TEXT_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0);
             }
         }
         else {
-            gcdialog_showText(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, func_80388784, 0);
+            gcdialog_showText(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, chTiptup_textEvent, 0);
         }
     }
     if(this->state == 3){
diff --git a/src/core1/code_1BE90.c b/src/core1/code_1BE90.c
index fc4bf994..db457be2 100644
--- a/src/core1/code_1BE90.c
+++ b/src/core1/code_1BE90.c
@@ -12,7 +12,7 @@ bool func_80250074(u8);
 void func_8024FD28(u8, s32);
 void func_8024FC1C(u8, s32);
 void func_8025AC20(enum comusic_e, s32, s32, f32, char*, s32);
-void func_8025AC7C(enum comusic_e, s32, s32, f32, s32, char*, s32);
+void func_8025AC7C(enum comusic_e, s32, s32, f32, s32 *, char*, s32);
 void comusicPlayer_free(void);
 void func_8025A55C(s32, s32, s32);
 void func_8025A7DC(enum comusic_e);
@@ -92,7 +92,7 @@ void comusicPlayer_init(void){
         iPtr->unk14 = 0;
         iPtr->unk15 = 0;
         iPtr->unk0 = 0.0f;
-        iPtr->unk18 = freelist_new(sizeof(struct12s),4);
+        iPtr->unk18 = (FREE_LIST(struct12s) *)freelist_new(sizeof(struct12s),4);
         for(i = 0; i < 0xE; i++){
             iPtr->unk1C[i] = 0;
         }
@@ -556,7 +556,7 @@ void func_8025AC20(enum comusic_e comusic_id, s32 arg1, s32 arg2, f32 arg3, char
     func_8025AC7C(comusic_id, arg1, arg2, 0.0f, (s32) __find_track(comusic_id)->unk1C, "comusic.c", VER_SELECT(0x3b1, 0x3b2,0,0));
 }
 
-void func_8025AC7C(enum comusic_e comusic_id, s32 arg1, s32 arg2, f32 arg3, s32 arg4, char* arg5, s32 arg6){
+void func_8025AC7C(enum comusic_e comusic_id, s32 arg1, s32 arg2, f32 arg3, s32 *arg4, char* arg5, s32 arg6){
     CoMusic *trackPtr;
     u32 slot_index;
 
@@ -632,7 +632,7 @@ void comusic_defrag(void){
     if(!D_80276E30) return;
 
     for(iPtr = &D_80276E30[0]; iPtr < &D_80276E30[6]; iPtr++){
-        iPtr->unk18 = freelist_defrag(iPtr->unk18);
+        iPtr->unk18 = (FREE_LIST(struct12s) *)freelist_defrag(iPtr->unk18);
     }
     D_80276E30 = (CoMusic *)defrag(D_80276E30);
 }
diff --git a/src/core1/code_2FA0.c b/src/core1/code_2FA0.c
index 7f1466ea..0ed7bc46 100644
--- a/src/core1/code_2FA0.c
+++ b/src/core1/code_2FA0.c
@@ -8,20 +8,20 @@
 s32 D_80275860 = 0;
 
 void func_802409C0(f32 arg0[3], f32 arg1){
-    f32 sp3C[3];
+    f32 vp_rotation[3];
     f32 sp30[3];
     f32 sp28[2];
-    f32 sp24;
+    f32 dt;
     
-    sp24 = time_getDelta()*arg1;
+    dt = time_getDelta()*arg1;
     func_8024E71C(0, sp28);
 
-    sp30[0] = sp28[0] * sp24;
+    sp30[0] = sp28[0] * dt;
     sp30[1] = 0.0f;
-    sp30[2] = -(sp28[1] * sp24);
+    sp30[2] = -(sp28[1] * dt);
 
-    viewport_getRotation_vec3f(&sp3C);
-    ml_vec3f_yaw_rotate_copy(sp30, sp30, sp3C[1]);
+    viewport_getRotation_vec3f(vp_rotation);
+    ml_vec3f_yaw_rotate_copy(sp30, sp30, vp_rotation[1]);
 
     arg0[0] = arg0[0] + sp30[0];
     arg0[1] = arg0[1] + sp30[1];
@@ -40,12 +40,12 @@ f32 func_80240A94(s32 arg0, f32 arg1){
 }
 
 void func_80240AC8(f32 arg0[3], f32 arg1){
-    f32 sp3C[3];
+    f32 vp_rotation[3];
     f32 sp30[3];
     f32 sp28[2];
-    f32 sp24;
+    f32 dt;
     
-    sp24 = time_getDelta()*arg1;
+    dt = time_getDelta()*arg1;
     func_8024E71C(0, sp28);
 
     if(0.0f != sp28[0] || 0.0f != sp28[1]){
@@ -57,13 +57,13 @@ void func_80240AC8(f32 arg0[3], f32 arg1){
         D_80275860 = 1;
     }
 
-    sp24 = func_80240A94(D_80275860, sp24);
-    sp30[0] = sp28[0] * sp24;
+    dt = func_80240A94(D_80275860, dt);
+    sp30[0] = sp28[0] * dt;
     sp30[1] = 0.0f;
-    sp30[2] = -(sp28[1] * sp24);
+    sp30[2] = -(sp28[1] * dt);
 
-    viewport_getRotation_vec3f(&sp3C);
-    ml_vec3f_yaw_rotate_copy(sp30, sp30, sp3C[1]);
+    viewport_getRotation_vec3f(vp_rotation);
+    ml_vec3f_yaw_rotate_copy(sp30, sp30, vp_rotation[1]);
 
     arg0[0] = arg0[0] + sp30[0];
     arg0[1] = arg0[1] + sp30[1];