Merge pull request #52 from DizzyEggg/patch-2

Update songs.h

1 files changed, 95 insertions, 3 deletions

diff --git a/include/songs.h b/include/songs.h
index afd26d683..d828e4068 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -15,8 +15,8 @@ enum
     /*0x09*/ SE_KAIDAN,
     /*0x0A*/ SE_DANSA,
     /*0x0B*/ SE_JITENSYA,
-    /*0x0C*/ SE_KOUKA_L,
-    /*0x0D*/ SE_KOUKA_M,
+    /*0x0C*/ SE_KOUKA_L, // Goggle told me Kouka means 'effectiveness' which makes sense, because
+    /*0x0D*/ SE_KOUKA_M, // those three sounds play whenever you use a move
     /*0x0E*/ SE_KOUKA_H,
     /*0x0F*/ SE_BOWA2,
     /*0x10*/ SE_POKE_DEAD,
@@ -359,7 +359,24 @@ enum
     BGM_DAIGO,
     BGM_THANKFOR,
     BGM_END,
-    BGM_BATTLE27, // wild
+    /*0x1C9*/ BGM_BATTLE_FRONTIER, // human-readable names start here because we don't know the actual filenames
+    BGM_BATTLE_ARENA,
+    BGM_ME_BATTLE_POINTS, // ME_ as in messagebox? Used for KINOMI (berries) and stuff above
+    BGM_ME_MATCH_CALL,
+    BGM_BATTLE_PYRAMID,
+    BGM_BATTLE_PYRAMID_SUMMIT,
+    BGM_BATTLE_PALACE,
+    BGM_FANFA_RAYQUAZA,
+    BGM_BATTLE_TOWER,
+    BGM_ME_BATTLE_SYMBOL,
+    BGM_BATTLE_DOME_TOURNAMENT,
+    BGM_BATTLE_PIKE,
+    BGM_BATTLE_FACTORY,
+    BGM_BATTLE_LEGENDARY,
+    BGM_BATTLE_FRONTIER_BRAIN,
+    BGM_BATTLE_MEW,
+    BGM_BATTLE_DOME, // end of the human-readable names
+    /*0x1DA*/ BGM_BATTLE27, // wild
     BGM_BATTLE31, // aqua/magma grunt
     BGM_BATTLE20, // trainer
     BGM_BATTLE32, // gym leader
@@ -369,6 +386,81 @@ enum
     BGM_BATTLE35, // rival
     BGM_BATTLE38, // elite four
     BGM_BATTLE30, // aqua/magma leader
+    /*0x1E4*/ BGM_FRLG_FOLLOW_ME, // FR/LG names not known, human-readable again!
+    BGM_FRLG_GAMECORNER,
+    BGM_FRLG_ROCKET_HIDEOUT,
+    BGM_FRLG_GYM,
+    BGM_FRLG_JIGGLYPUFF,
+    BGM_FRLG_OPENING,
+    BGM_FRLG_TITLE,
+    BGM_FRLG_CINNABAR_ISLAND,
+    BGM_FRLG_LAVENDER_TOWN,
+    BGM_FRLG_HEALING_TEST,
+    BGM_FRLG_BICYCLE,
+    BGM_FRLG_SUSPICIOUS_EYE,
+    BGM_FRLG_GIRL_EYE,
+    BGM_FRLG_BOY_EYE,
+    BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME,
+    BGM_FRLG_VIRIDIAN_FOREST,
+    BGM_FRLG_MT_MOON,
+    BGM_FRLG_POKEMON_MANSION,
+    BGM_FRLG_CREDITS,
+    BGM_FRLG_ROUTE_1,
+    BGM_FRLG_ROUTE_24,
+    BGM_FRLG_ROUTE_3,
+    BGM_FRLG_ROUTE_11,
+    BGM_FRLG_INDIGO_PLATEAU,
+    BGM_FRLG_BATTLE_LEADER,
+    BGM_FRLG_BATTLE_TRAINER,
+    BGM_FRLG_BATTLE_WILD_POKEMON,
+    BGM_FRLG_BATTLE_CHAMPION,
+    BGM_FRLG_PALLET_TOWN,
+    BGM_FRLG_OAK_LAB,
+    BGM_FRLG_PROF_OAK,
+    BGM_FRLG_POKEMON_CENTER,
+    BGM_FRLG_SS_ANNE,
+    BGM_FRLG_SURF,
+    BGM_FRLG_POKEMON_TOWER,
+    BGM_FRLG_SILPH,
+    BGM_FRLG_CERULEAN_CITY,
+    BGM_FRLG_CELADON_CITY,
+    BGM_FRLG_KACHI_TRAINER, // KACHI used in RS test - victory
+    BGM_FRLG_KACHI_WILD_POKEMON,
+    BGM_FRLG_KACHI_LEADER,
+    BGM_FRLG_VERMILION_CITY,
+    BGM_FRLG_VIRIDIAN_CITY,
+    BGM_FRLG_RIVAL,
+    BGM_FRLG_RIVAL_POSTBATTLE,
+    BGM_FRLG_ME_POKEDEX_EVAL,
+    BGM_FRLG_ME_KEYITEM,
+    BGM_FRLG_FANFA_POKEMON_CAUGHT,
+    BGM_FRLG_FANFA_TRAINERCARD_PHOTO,
+    BGM_FRLG_GAMEFREAK_LOGO,
+    BGM_FRLG_CAUGHT_POKEMON,
+    BGM_FRLG_GAME_EXPLANATION_START,
+    BGM_FRLG_GAME_EXPLANATION_MIDDLE,
+    BGM_FRLG_GAME_EXPLANATION_END,
+    BGM_FRLG_POKEMON_JUMP,
+    BGM_FRLG_UNION_ROOM,
+    BGM_FRLG_POKEMON_NETWORK_CENTER,
+    BGM_FRLG_MYSTERY_GIFT,
+    BGM_FRLG_DODRIO_BERRY_PICK,
+    BGM_FRLG_MT_EMBER,
+    BGM_FRLG_TEACHY_TV_EPISODE,
+    BGM_FRLG_SEVII_ISLANDS,
+    BGM_FRLG_TANOBY_RUINS,
+    BGM_FRLG_ISLAND_ONE,
+    BGM_FRLG_ISLAND_FOUR,
+    BGM_FRLG_ISLAND_SIX,
+    BGM_FRLG_FLUTE,
+    BGM_FRLG_BATTLE_DEOXYS,
+    BGM_FRLG_BATTLE_MEWTWO,
+    BGM_FRLG_BATTLE_LEGENDARY,
+    BGM_FRLG_LEADER_EYE,
+    BGM_FRLG_DEOXYS_EYE,
+    BGM_FRLG_TRAINER_TOWER,
+    BGM_FRLG_HALL_OF_FAME_PALLET_TOWN,
+    /*0x22E*/BGM_FRLG_TEACHY_TV,
 };
 
 #endif // GUARD_SONGS_H