Merge branch 'mr-origin-73'

src/MMM/code_3420.c

@@ -11,7 +11,7 @@ typedef struct {
 } Struct_MMM_3420_0;
 
 typedef struct {
-    u8 unk0;
+    u8 unk0; // black key flag? black key == 2 || 4
     u8 unk1;
 } Struct_MMM_3420_1;
 
@@ -300,7 +300,8 @@ void func_80389D9C(s32 key_id){
     D_8038C4F0.unk0++;
 }
 
-void func_80389DF4(s32 arg0, s32 arg1) {
+// organ game/higgy in church?
+void code3420_handleOrganGame(s32 arg0, s32 arg1) {
     Struct_MMM_3420_1 *iPtr;
     f32 key_position[3];
     bool is_black_key;

src/MMM/code_DC0.c

@@ -82,11 +82,11 @@ bool MMM_func_80387340(ActorMarker *marker){
         if(sp1C == 0){
             ml_vec3f_copy(sp20, actor->position);
             sp20[1] += 80.0f;
-            func_8025A70C(COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
+            comusic_playTrack(COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
             jiggy_spawn(JIGGY_63_MMM_FLOWER_POTS, sp20);
         }
         else{
-            func_8025A70C(COMUSIC_2B_DING_B);
+            comusic_playTrack(COMUSIC_2B_DING_B);
         }
     }
     func_803871D4(sp1C);