core2/code_9B650.c done

include/enums.h

@@ -563,8 +563,8 @@ enum comusic_e
     COMUSIC_26_GV_SANDYBUTT_DANGER,
     COMUSIC_27_GV_RUBEES_SONG,
     COMUSIC_28_SOMETHING_AQUATIC,
-    COMUSIC_28_CCW_SUMMER,
-    COMUSIC_28_CCW_WINTER,
+    COMUSIC_29_CCW_SUMMER,
+    COMUSIC_2A_CCW_WINTER,
     COMUSIC_2B_DING_B,
     COMUSIC_2C_BUZZER,
     COMUSIC_2D_PUZZLE_SOLVED_FANFARE,
@@ -634,11 +634,11 @@ enum comusic_e
     COMUSIC_6D_CCW_GNAWTYS_HOUSE,
     COMUSIC_6E_GAME_SELECT,
     COMUSIC_6F_PAUSE_SCREEN,
-    MUSIC_MMM_INSIDE_LOGGO = 0x70,
-    MUSIC_FF,
+    COMUSIC_70_MMM_INSIDE_LOGGO,
+    COMUSIC_71_FF,
     MUSIC_BGS_FLIBBIT_FIGHT,
     COMUSIC_73_GAMEBOY,
-    MUSIC_GL_FINAL_SECTION,
+    COMUSIC_74_GL_FINAL_SECTION,
     SFX_RED_FEATHER_REFILL,
     SFX_GOLD_FEATHER_REFILL,
     SFX_EGG_REFILL,
@@ -650,14 +650,14 @@ enum comusic_e
     COMUSIC_7D_STEP_ON_BK_TILE,
     COMUSIC_7E_STEP_ON_MINIGAME_TILE,
     COMUSIC_7F_STEP_ON_JOKER_TILE,
-    MUSIC_GAME_OVER_CUTSCENE = 0x80,
+    COMUSIC_80_GAME_OVER_CUTSCENE = 0x80,
     COMUSIC_81_ACTIVATING_BRENTILDA,
     SFX_REMOVE_JIGGY,
-    MUSIC_GV_SNS, // Not 100% sure on these
-    MUSIC_TTC_SNS,
-    MUSIC_FP_SNS,
-    MUSIC_MMM_SNS,
-    MUSIC_MMM_SNS_HAPPIER,
+    COMUSIC_83_GV_SNS, // Not 100% sure on these
+    COMUSIC_84_TTC_SNS,
+    COMUSIC_85_FP_SNS,
+    COMUSIC_86_MMM_SNS,
+    COMUSIC_87_MMM_SNS_HAPPIER,
     COMUSIC_88_BIG_SNS_FANFARE,
     SFX_JINJO_STATUE_POWERUP,
     COMUSIC_8A_GETTING_TURBO_TRAINERS,
@@ -667,7 +667,7 @@ enum comusic_e
     COMUSIC_8E_CREDITS,
     JINGLE_MENACING_GRUNTILDA_B,
     JINGLE_END_OF_INTRO = 0x90,
-    MUSIC_GRUNTY_FALLING,
+    COMUSIC_91_GRUNTY_FALLING,
     SFX_GRUNTY_SPELL_POWERUP,
     SFX_AIR_METER_DROPPING,
     COMUSIC_94_BBONUS,
@@ -690,9 +690,9 @@ enum comusic_e
     JINGLE_JINJONATOR_DRUMMING_B,
     JINGLE_JINJONATOR_DRUMMING_C,
     JINGLE_JINJONATOR_DRUMMING_D,
-    MUSIC_KLUNGO_BY_FALLEN_GRUNTY,
+    COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY,
     COMUSIC_A9_TOOTY,
-    MUSIC_BEACH,
+    COMUSIC_AA_BEACH,
     JINGLE_JINJOATOR_FINAL_HIT,
     COMUSIC_AC_GOOD_ENDING = 0xAC
 };