Add most English song and SFX names as comments in songs.h and song_table.inc

Ported from my work in pokeemerald.

1 files changed, 356 insertions, 356 deletions

diff --git a/sound/song_table.inc b/sound/song_table.inc
index ac2e3b494..d2aa7d327 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -1,253 +1,253 @@
 	.align 2
 gSongTable:: @ 845548C
 	song se_stop, 0, 0
-	song se_kaifuku, 1, 1
-	song se_pc_logon, 1, 1
-	song se_pc_off, 1, 1
-	song se_pc_on, 1, 1
-	song se_select, 2, 2
-	song se_win_open, 1, 1
-	song se_wall_hit, 2, 2
-	song se_door, 1, 1
-	song se_kaidan, 1, 1
-	song se_dansa, 1, 1
-	song se_jitensya, 1, 1
-	song se_kouka_l, 1, 1
-	song se_kouka_m, 1, 1
-	song se_kouka_h, 1, 1
-	song se_bowa2, 1, 1
-	song se_poke_dead, 1, 1
-	song se_nigeru, 1, 1
-	song se_jido_doa, 1, 1
-	song se_naminori, 1, 1
-	song se_ban, 1, 1
-	song se_pin, 1, 1
-	song se_boo, 1, 1
-	song se_bowa, 1, 1
-	song se_jyuni, 2, 2
-	song se_a, 1, 1
-	song se_i, 1, 1
-	song se_u, 1, 1
-	song se_e, 1, 1
-	song se_o, 1, 1
-	song se_n, 1, 1
-	song se_seikai, 1, 1
-	song se_hazure, 1, 1
-	song se_exp, 1, 1
-	song se_jite_pyoko, 1, 1
+	song se_kaifuku, 1, 1                @ Healing Item
+	song se_pc_logon, 1, 1               @ PC Logon
+	song se_pc_off, 1, 1                 @ PC Shutdown
+	song se_pc_on, 1, 1                  @ PC Startup
+	song se_select, 2, 2                 @ Cursor Selection
+	song se_win_open, 1, 1               @ Start Menu
+	song se_wall_hit, 2, 2               @ Wall Bump
+	song se_door, 1, 1                   @ Opening Door
+	song se_kaidan, 1, 1                 @ Stairs
+	song se_dansa, 1, 1                  @ Ledge
+	song se_jitensya, 1, 1               @ Bicycle Bell
+	song se_kouka_l, 1, 1                @ Not Very Effective
+	song se_kouka_m, 1, 1                @ Normal Effectiveness
+	song se_kouka_h, 1, 1                @ Super Effective
+	song se_bowa2, 1, 1                  @ Pokémon Withdrawl
+	song se_poke_dead, 1, 1              @ Pokémon Fainted
+	song se_nigeru, 1, 1                 @ Flee from Wild Battle
+	song se_jido_doa, 1, 1               @ Pokémon Center Door
+	song se_naminori, 1, 1               @ Briney's Ship
+	song se_ban, 1, 1                    @ Bang
+	song se_pin, 1, 1                    @ Exclamation Bubble
+	song se_boo, 1, 1                    @ Contest Jam
+	song se_bowa, 1, 1                   @ Giving Poké Ball to Nurse, Poké Ball wiggle
+	song se_jyuni, 2, 2                  @ Places in Contest Appearing
+	song se_a, 1, 1                      @ Bard A
+	song se_i, 1, 1                      @ Bard I
+	song se_u, 1, 1                      @ Bard U
+	song se_e, 1, 1                      @ Bard E
+	song se_o, 1, 1                      @ Bard O
+	song se_n, 1, 1                      @ Bard N
+	song se_seikai, 1, 1                 @ Success
+	song se_hazure, 1, 1                 @ Failure
+	song se_exp, 1, 1                    @ Exp. Bar
+	song se_jite_pyoko, 1, 1             @ Bunny Hop
 	song se_mu_pachi, 1, 1
-	song se_tk_kasya, 1, 1
+	song se_tk_kasya, 1, 1               @ Mossdeep Gym/Trick House Switch
 	song se_fu_zaku, 1, 1
 	song se_fu_zaku2, 1, 1
-	song se_fu_zuzuzu, 1, 1
-	song se_ru_gashin, 1, 1
-	song se_ru_gasyan, 1, 1
-	song se_ru_bari, 1, 1
-	song se_ru_hyuu, 1, 1
+	song se_fu_zuzuzu, 1, 1              @ Lavaridge Gym Warp
+	song se_ru_gashin, 1, 1              @ Sootopolis Gym - Stairs Appear
+	song se_ru_gasyan, 1, 1              @ Sootopolis Gym - Ice Breaking
+	song se_ru_bari, 1, 1                @ Sootopolis Gym - Walking on Ice
+	song se_ru_hyuu, 1, 1                @ Falling Down
 	song se_ki_gasyan, 2, 2
-	song se_tk_warpin, 1, 1
-	song se_tk_warpout, 1, 1
-	song se_tu_saa, 1, 1
-	song se_hi_turun, 1, 1
-	song se_track_move, 1, 1
-	song se_track_stop, 1, 1
-	song se_track_haik, 2, 2
-	song se_track_door, 1, 1
+	song se_tk_warpin, 1, 1              @ Warp In
+	song se_tk_warpout, 1, 1             @ Warp Out
+	song se_tu_saa, 1, 1                 @ Repel
+	song se_hi_turun, 1, 1               @ Moving Obstacle in Fortree Gym
+	song se_track_move, 1, 1             @ Moving Truck
+	song se_track_stop, 1, 1             @ Moving Truck Stop
+	song se_track_haik, 2, 2             @ Moving Truck Unload
+	song se_track_door, 1, 1             @ Moving Truck Door
 	song se_moter, 2, 2
 	song se_card, 1, 1
-	song se_save, 1, 1
-	song se_kon, 1, 1
-	song se_kon2, 1, 1
-	song se_kon3, 1, 1
-	song se_kon4, 1, 1
-	song se_suikomu, 2, 2
-	song se_nageru, 1, 1
-	song se_toy_c, 2, 2
-	song se_toy_d, 2, 2
-	song se_toy_e, 2, 2
-	song se_toy_f, 2, 2
-	song se_toy_g, 2, 2
-	song se_toy_a, 2, 2
-	song se_toy_b, 2, 2
-	song se_toy_c1, 2, 2
-	song se_mizu, 2, 2
-	song se_hashi, 2, 2
-	song se_daugi, 1, 1
-	song se_pinpon, 1, 1
-	song se_fuusen1, 2, 2
-	song se_fuusen2, 2, 2
-	song se_fuusen3, 2, 2
-	song se_toy_kabe, 2, 2
-	song se_toy_dango, 2, 2
-	song se_doku, 1, 1
-	song se_esuka, 1, 1
-	song se_t_ame, 3, 3
-	song se_t_ame_e, 3, 3
-	song se_t_ooame, 3, 3
-	song se_t_ooame_e, 3, 3
-	song se_t_koame, 3, 3
-	song se_t_koame_e, 3, 3
-	song se_t_kami, 1, 1
-	song se_t_kami2, 1, 1
-	song se_elebeta, 1, 1
-	song se_hinsi, 3, 3
-	song se_expmax, 1, 1
-	song se_tamakoro, 2, 2
-	song se_tamakoro_e, 2, 2
+	song se_save, 1, 1                   @ Save
+	song se_kon, 1, 1                    @ Poke Ball Bounce 1
+	song se_kon2, 1, 1                   @ Poké Ball Bounce 2
+	song se_kon3, 1, 1                   @ Poké Ball Bounce 3
+	song se_kon4, 1, 1                   @ Poké Ball Bounce 4
+	song se_suikomu, 2, 2                @ Poké Ball Trade
+	song se_nageru, 1, 1                 @ Poké Ball Throw
+	song se_toy_c, 2, 2                  @ Note C
+	song se_toy_d, 2, 2                  @ Note D
+	song se_toy_e, 2, 2                  @ Note E
+	song se_toy_f, 2, 2                  @ Note F
+	song se_toy_g, 2, 2                  @ Note G
+	song se_toy_a, 2, 2                  @ Note A
+	song se_toy_b, 2, 2                  @ Note B
+	song se_toy_c1, 2, 2                 @ Note High C
+	song se_mizu, 2, 2                   @ Puddle
+	song se_hashi, 2, 2                  @ Boardwalk
+	song se_daugi, 1, 1                  @ Slots Credits
+	song se_pinpon, 1, 1                 @ Ding-dong!
+	song se_fuusen1, 2, 2                @ Red Balloon
+	song se_fuusen2, 2, 2                @ Blue Balloon
+	song se_fuusen3, 2, 2                @ Yellow Balloon
+	song se_toy_kabe, 2, 2               @ Breakable Door
+	song se_toy_dango, 2, 2              @ Mud Ball
+	song se_doku, 1, 1                   @ Overworld Poison damage
+	song se_esuka, 1, 1                  @ Escalator
+	song se_t_ame, 3, 3                  @ Rain
+	song se_t_ame_e, 3, 3                @ Rain stop
+	song se_t_ooame, 3, 3                @ Heavy Rain
+	song se_t_ooame_e, 3, 3              @ Heavy Rain stop
+	song se_t_koame, 3, 3                @ Light Rain
+	song se_t_koame_e, 3, 3              @ Light Rain stop
+	song se_t_kami, 1, 1                 @ Thunder
+	song se_t_kami2, 1, 1                @ Thunder 2
+	song se_elebeta, 1, 1                @ Elevator
+	song se_hinsi, 3, 3                  @ Low Health
+	song se_expmax, 1, 1                 @ Exp. Max
+	song se_tamakoro, 2, 2               @ Roulette Ball
+	song se_tamakoro_e, 2, 2             @ Roulette Ball 2
 	song se_basabasa, 1, 1
-	song se_regi, 1, 1
-	song se_c_gaji, 1, 1
-	song se_c_maku_u, 1, 1
-	song se_c_maku_d, 1, 1
+	song se_regi, 1, 1                   @ Cash Register
+	song se_c_gaji, 1, 1                 @ Contest Hearts
+	song se_c_maku_u, 1, 1               @ Contest Curtain rise
+	song se_c_maku_d, 1, 1               @ Contest Curtain fall
 	song se_c_pasi, 1, 1
 	song se_c_syu, 1, 1
-	song se_c_pikon, 1, 1
-	song se_reapoke, 1, 1
-	song se_op_basyu, 1, 1
-	song se_bt_start, 1, 1
-	song se_dendou, 1, 1
-	song se_jihanki, 1, 1
-	song se_tama, 1, 1
-	song se_z_scroll, 1, 1
-	song se_z_page, 1, 1
-	song se_pn_on, 1, 1
-	song se_pn_off, 1, 1
-	song se_z_search, 1, 1
-	song se_tamago, 1, 1
-	song se_tb_start, 1, 1
-	song se_tb_kon, 1, 1
-	song se_tb_kara, 2, 2
+	song se_c_pikon, 1, 1                @ Pokémon Appears in Contest
+	song se_reapoke, 1, 1                @ Shiny Pokémon
+	song se_op_basyu, 1, 1               @ Opening Movie -> Title Screen whoosh
+	song se_bt_start, 1, 1               @ Battle Mugshot whoosh
+	song se_dendou, 1, 1                 @ Audience Cheering
+	song se_jihanki, 1, 1                @ Vending Machine
+	song se_tama, 1, 1                   @ Orb Used
+	song se_z_scroll, 1, 1               @ Pokédex Scrolling
+	song se_z_page, 1, 1                 @ Pokédex Page
+	song se_pn_on, 1, 1                  @ PokéNav On
+	song se_pn_off, 1, 1                 @ PokéNav Off
+	song se_z_search, 1, 1               @ Pokédex Search
+	song se_tamago, 1, 1                 @ Egg hatch
+	song se_tb_start, 1, 1               @ Battle - Poké Ball Tray slide in
+	song se_tb_kon, 1, 1                 @ Battle - Poké Ball Tray ball sound
+	song se_tb_kara, 2, 2                @ Battle - Poké Ball Tray slide out
 	song se_bidoro, 1, 1
-	song se_w085, 2, 2
-	song se_w085b, 1, 1
-	song se_w231, 1, 1
-	song se_w171, 1, 1
-	song se_w233, 1, 1
-	song se_w233b, 1, 1
-	song se_w145, 1, 1
-	song se_w145b, 1, 1
-	song se_w145c, 1, 1
-	song se_w240, 1, 1
-	song se_w015, 1, 1
-	song se_w081, 1, 1
-	song se_w081b, 1, 1
-	song se_w088, 1, 1
-	song se_w016, 2, 2
-	song se_w016b, 2, 2
-	song se_w003, 1, 1
-	song se_w104, 1, 1
-	song se_w013, 1, 1
-	song se_w196, 1, 1
-	song se_w086, 1, 1
-	song se_w004, 1, 1
-	song se_w025, 1, 1
-	song se_w025b, 1, 1
-	song se_w152, 1, 1
-	song se_w026, 1, 1
-	song se_w172, 1, 1
-	song se_w172b, 1, 1
-	song se_w053, 1, 1
-	song se_w007, 1, 1
-	song se_w092, 1, 1
-	song se_w221, 1, 1
-	song se_w221b, 2, 2
-	song se_w052, 1, 1
-	song se_w036, 2, 2
-	song se_w059, 1, 1
-	song se_w059b, 1, 1
-	song se_w010, 1, 1
-	song se_w011, 1, 1
-	song se_w017, 1, 1
-	song se_w019, 1, 1
-	song se_w028, 1, 1
-	song se_w013b, 1, 1
-	song se_w044, 1, 1
-	song se_w029, 1, 1
-	song se_w057, 1, 1
-	song se_w056, 1, 1
-	song se_w250, 1, 1
-	song se_w030, 1, 1
-	song se_w039, 2, 2
-	song se_w054, 1, 1
-	song se_w077, 1, 1
-	song se_w020, 2, 2
-	song se_w082, 1, 1
-	song se_w047, 1, 1
-	song se_w195, 1, 1
-	song se_w006, 1, 1
-	song se_w091, 1, 1
-	song se_w146, 1, 1
-	song se_w120, 1, 1
-	song se_w153, 1, 1
-	song se_w071b, 1, 1
-	song se_w071, 1, 1
-	song se_w103, 1, 1
-	song se_w062, 1, 1
-	song se_w062b, 1, 1
-	song se_w048, 1, 1
-	song se_w187, 1, 1
-	song se_w118, 1, 1
-	song se_w155, 1, 1
-	song se_w122, 1, 1
-	song se_w060, 1, 1
-	song se_w185, 1, 1
-	song se_w014, 1, 1
-	song se_w043, 1, 1
-	song se_w207, 1, 1
-	song se_w207b, 1, 1
-	song se_w215, 1, 1
-	song se_w109, 1, 1
-	song se_w173, 1, 1
-	song se_w280, 1, 1
-	song se_w202, 1, 1
-	song se_w060b, 1, 1
-	song se_w076, 2, 2
-	song se_w080, 1, 1
-	song se_w100, 1, 1
-	song se_w107, 1, 1
-	song se_w166, 1, 1
-	song se_w129, 1, 1
-	song se_w115, 1, 1
-	song se_w112, 1, 1
-	song se_w197, 2, 2
-	song se_w199, 1, 1
-	song se_w236, 1, 1
-	song se_w204, 1, 1
-	song se_w268, 1, 1
-	song se_w070, 1, 1
-	song se_w063, 1, 1
-	song se_w127, 1, 1
-	song se_w179, 1, 1
-	song se_w151, 1, 1
-	song se_w201, 1, 1
-	song se_w161, 1, 1
-	song se_w161b, 1, 1
-	song se_w227, 1, 1
-	song se_w227b, 2, 2
-	song se_w226, 1, 1
-	song se_w208, 1, 1
-	song se_w213, 1, 1
-	song se_w213b, 1, 1
-	song se_w234, 1, 1
-	song se_w260, 1, 1
-	song se_w328, 1, 1
-	song se_w320, 1, 1
-	song se_w255, 1, 1
-	song se_w291, 1, 1
-	song se_w089, 2, 2
-	song se_w239, 2, 2
-	song se_w230, 1, 1
-	song se_w281, 1, 1
-	song se_w327, 2, 2
-	song se_w287, 1, 1
-	song se_w257, 1, 1
-	song se_w253, 1, 1
-	song se_w258, 1, 1
-	song se_w322, 2, 2
-	song se_w298, 1, 1
-	song se_w287b, 1, 1
-	song se_w114, 1, 1
-	song se_w063b, 1, 1
+	song se_w085, 2, 2                   @ Thunderbolt
+	song se_w085b, 1, 1                  @ Thunderbolt 2
+	song se_w231, 1, 1                   @ Harden
+	song se_w171, 1, 1                   @ Nightmare
+	song se_w233, 1, 1                   @ Vital Throw
+	song se_w233b, 1, 1                  @ Vital Throw 2
+	song se_w145, 1, 1                   @ Bubble
+	song se_w145b, 1, 1                  @ Bubble 2
+	song se_w145c, 1, 1                  @ Bubble 3
+	song se_w240, 1, 1                   @ Rain Dance
+	song se_w015, 1, 1                   @ Cut
+	song se_w081, 1, 1                   @ String Shot
+	song se_w081b, 1, 1                  @ String Shot 2
+	song se_w088, 1, 1                   @ Rock Throw
+	song se_w016, 2, 2                   @ Gust
+	song se_w016b, 2, 2                  @ Gust 2
+	song se_w003, 1, 1                   @ DoubleSlap
+	song se_w104, 1, 1                   @ Double Team
+	song se_w013, 1, 1                   @ Razor Wind
+	song se_w196, 1, 1                   @ Icy Wind
+	song se_w086, 1, 1                   @ Thunder Wave
+	song se_w004, 1, 1                   @ Comet Punch
+	song se_w025, 1, 1                   @ Mega Kick
+	song se_w025b, 1, 1                  @ Mega Kick 2
+	song se_w152, 1, 1                   @ Crabhammer
+	song se_w026, 1, 1                   @ Jump Kick
+	song se_w172, 1, 1                   @ Flame Wheel
+	song se_w172b, 1, 1                  @ Flame Wheel 2
+	song se_w053, 1, 1                   @ Flamethrower
+	song se_w007, 1, 1                   @ Fire Punch
+	song se_w092, 1, 1                   @ Toxic
+	song se_w221, 1, 1                   @ Sacred Fire
+	song se_w221b, 2, 2                  @ Sacred Fire 2
+	song se_w052, 1, 1                   @ Ember
+	song se_w036, 2, 2                   @ Take Down
+	song se_w059, 1, 1                   @ Blizzard
+	song se_w059b, 1, 1                  @ Blizzard 2
+	song se_w010, 1, 1                   @ Scratch
+	song se_w011, 1, 1                   @ Vicegrip
+	song se_w017, 1, 1                   @ Wing Attack
+	song se_w019, 1, 1                   @ Fly
+	song se_w028, 1, 1                   @ Sand-Attack
+	song se_w013b, 1, 1                  @ Razor Wind 2
+	song se_w044, 1, 1                   @ Bite
+	song se_w029, 1, 1                   @ Headbutt
+	song se_w057, 1, 1                   @ Surf
+	song se_w056, 1, 1                   @ Hydro Pump
+	song se_w250, 1, 1                   @ Whirlpool
+	song se_w030, 1, 1                   @ Horn Attack
+	song se_w039, 2, 2                   @ Tail Whip
+	song se_w054, 1, 1                   @ Mist
+	song se_w077, 1, 1                   @ PoisonPowder
+	song se_w020, 2, 2                   @ Bind
+	song se_w082, 1, 1                   @ Dragon Rage
+	song se_w047, 1, 1                   @ Sing
+	song se_w195, 1, 1                   @ Perish Song
+	song se_w006, 1, 1                   @ Pay Day
+	song se_w091, 1, 1                   @ Dig
+	song se_w146, 1, 1                   @ Dizzy Punch
+	song se_w120, 1, 1                   @ Self-Destruct
+	song se_w153, 1, 1                   @ Explosion
+	song se_w071b, 1, 1                  @ Absorb 2
+	song se_w071, 1, 1                   @ Absorb
+	song se_w103, 1, 1                   @ Screech
+	song se_w062, 1, 1                   @ BubbleBeam
+	song se_w062b, 1, 1                  @ BubbleBeam 2
+	song se_w048, 1, 1                   @ Supersonic
+	song se_w187, 1, 1                   @ Belly Drum
+	song se_w118, 1, 1                   @ Metronome
+	song se_w155, 1, 1                   @ Bonemerang
+	song se_w122, 1, 1                   @ Lick
+	song se_w060, 1, 1                   @ Psybeam
+	song se_w185, 1, 1                   @ Faint Attack
+	song se_w014, 1, 1                   @ Swords Dance
+	song se_w043, 1, 1                   @ Leer
+	song se_w207, 1, 1                   @ Swagger
+	song se_w207b, 1, 1                  @ Swagger 2
+	song se_w215, 1, 1                   @ Heal Bell
+	song se_w109, 1, 1                   @ Confuse Ray
+	song se_w173, 1, 1                   @ Snore
+	song se_w280, 1, 1                   @ Brick Break
+	song se_w202, 1, 1                   @ Giga Drain
+	song se_w060b, 1, 1                  @ Psybeam 2
+	song se_w076, 2, 2                   @ SolarBeam
+	song se_w080, 1, 1                   @ Petal Dance
+	song se_w100, 1, 1                   @ Teleport
+	song se_w107, 1, 1                   @ Minimize
+	song se_w166, 1, 1                   @ Sketch
+	song se_w129, 1, 1                   @ Swift
+	song se_w115, 1, 1                   @ Reflect
+	song se_w112, 1, 1                   @ Barrier
+	song se_w197, 2, 2                   @ Detect
+	song se_w199, 1, 1                   @ Lock-On
+	song se_w236, 1, 1                   @ Moonlight
+	song se_w204, 1, 1                   @ Charm
+	song se_w268, 1, 1                   @ Charge
+	song se_w070, 1, 1                   @ Strength
+	song se_w063, 1, 1                   @ Hyper Beam
+	song se_w127, 1, 1                   @ Waterfall
+	song se_w179, 1, 1                   @ Reversal
+	song se_w151, 1, 1                   @ Acid Armor
+	song se_w201, 1, 1                   @ Sandstorm
+	song se_w161, 1, 1                   @ Tri-Attack
+	song se_w161b, 1, 1                  @ Tri-Attack 2
+	song se_w227, 1, 1                   @ Encore
+	song se_w227b, 2, 2                  @ Encore 2
+	song se_w226, 1, 1                   @ Baton Pass
+	song se_w208, 1, 1                   @ Milk Drink
+	song se_w213, 1, 1                   @ Attract
+	song se_w213b, 1, 1                  @ Attract 2
+	song se_w234, 1, 1                   @ Morning Sun
+	song se_w260, 1, 1                   @ Flatter
+	song se_w328, 1, 1                   @ Sand Tomb
+	song se_w320, 1, 1                   @ GrassWhistle
+	song se_w255, 1, 1                   @ Spit Up
+	song se_w291, 1, 1                   @ Dive
+	song se_w089, 2, 2                   @ Earthquake
+	song se_w239, 2, 2                   @ Twister
+	song se_w230, 1, 1                   @ Sweet Scent
+	song se_w281, 1, 1                   @ Yawn
+	song se_w327, 2, 2                   @ Sky Uppercut
+	song se_w287, 1, 1                   @ Stat Increased
+	song se_w257, 1, 1                   @ Heat Wave
+	song se_w253, 1, 1                   @ Uproar
+	song se_w258, 1, 1                   @ Hail
+	song se_w322, 2, 2                   @ Cosmic Power
+	song se_w298, 1, 1                   @ Teeter Dance
+	song se_w287b, 1, 1                  @ Stat Decreased
+	song se_w114, 1, 1                   @ Haze
+	song se_w063b, 1, 1                  @ Hyper Beam 2
 	song song_248, 2, 2
 	song song_249, 2, 2
 	song song_250, 2, 2
@@ -350,125 +350,125 @@ gSongTable:: @ 845548C
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
-	song bgm_tetsuji, 0, 0
-	song bgm_field13, 0, 0
-	song bgm_kachi22, 0, 0
-	song bgm_kachi2, 0, 0
-	song bgm_kachi3, 0, 0
-	song bgm_kachi5, 0, 0
-	song bgm_pcc, 0, 0
-	song bgm_nibi, 0, 0
-	song bgm_suikun, 0, 0
-	song bgm_dooro1, 0, 0
-	song bgm_dooro_x1, 0, 0
-	song bgm_dooro_x3, 0, 0
-	song bgm_machi_s2, 0, 0
-	song bgm_machi_s4, 0, 0
-	song bgm_gim, 0, 0
-	song bgm_naminori, 0, 0
-	song bgm_dan01, 0, 0
-	song bgm_fanfa1, 2, 2
-	song bgm_me_asa, 2, 2
-	song bgm_me_bachi, 2, 2
-	song bgm_fanfa4, 2, 2
-	song bgm_fanfa5, 2, 2
-	song bgm_me_waza, 2, 2
-	song bgm_bijyutu, 0, 0
-	song bgm_dooro_x4, 0, 0
-	song bgm_fune_kan, 0, 0
-	song bgm_me_shinka, 2, 2
-	song bgm_shinka, 0, 0
-	song bgm_me_wasure, 2, 2
-	song bgm_syoujoeye, 0, 0
-	song bgm_boyeye, 0, 0
-	song bgm_dan02, 0, 0
-	song bgm_machi_s3, 0, 0
-	song bgm_odamaki, 0, 0
-	song bgm_b_tower, 0, 0
-	song bgm_swimeye, 0, 0
-	song bgm_dan03, 0, 0
-	song bgm_me_kinomi, 2, 2
-	song bgm_me_tama, 2, 2
-	song bgm_me_b_big, 2, 2
-	song bgm_me_b_small, 2, 2
-	song bgm_me_zannen, 2, 2
-	song bgm_bd_time, 0, 0
-	song bgm_test1, 0, 0
-	song bgm_test2, 0, 0
-	song bgm_test3, 0, 0
-	song bgm_test4, 0, 0
-	song bgm_test, 0, 0
-	song bgm_gomachi0, 0, 0
-	song bgm_gotown, 0, 0
-	song bgm_pokecen, 0, 0
-	song bgm_nextroad, 0, 0
-	song bgm_granroad, 0, 0
-	song bgm_cycling, 0, 0
-	song bgm_friendly, 0, 0
-	song bgm_mishiro, 0, 0
-	song bgm_tozan, 0, 0
-	song bgm_girleye, 0, 0
-	song bgm_minamo, 0, 0
-	song bgm_ashroad, 0, 0
-	song bgm_event0, 0, 0
-	song bgm_deepdeep, 0, 0
-	song bgm_kachi1, 0, 0
-	song bgm_title3, 0, 0
-	song bgm_demo1, 0, 0
-	song bgm_girl_sup, 0, 0
-	song bgm_hageshii, 0, 0
-	song bgm_kakkoii, 0, 0
-	song bgm_kazanbai, 0, 0
-	song bgm_aqa_0, 0, 0
-	song bgm_tsuretek, 0, 0
-	song bgm_boy_sup, 0, 0
-	song bgm_rainbow, 0, 0
-	song bgm_ayasii, 0, 0
-	song bgm_kachi4, 0, 0
-	song bgm_ropeway, 0, 0
-	song bgm_casino, 0, 0
-	song bgm_hightown, 0, 0
-	song bgm_safari, 0, 0
-	song bgm_c_road, 0, 0
-	song bgm_ajito, 0, 0
-	song bgm_m_boat, 0, 0
-	song bgm_m_dungon, 0, 0
-	song bgm_finecity, 0, 0
-	song bgm_machupi, 0, 0
-	song bgm_p_school, 0, 0
-	song bgm_dendou, 0, 0
-	song bgm_tonekusa, 0, 0
-	song bgm_maborosi, 0, 0
-	song bgm_con_fan, 0, 0
-	song bgm_contest0, 0, 0
-	song bgm_mgm0, 0, 0
-	song bgm_t_battle, 0, 0
-	song bgm_ooame, 0, 0
-	song bgm_hideri, 0, 0
-	song bgm_runecity, 0, 0
-	song bgm_con_k, 0, 0
-	song bgm_eikou_r, 0, 0
-	song bgm_karakuri, 0, 0
-	song bgm_hutago, 0, 0
-	song bgm_sitennou, 0, 0
-	song bgm_yama_eye, 0, 0
-	song bgm_conlobby, 0, 0
-	song bgm_inter_v, 0, 0
-	song bgm_daigo, 0, 0
-	song bgm_thankfor, 0, 0
-	song bgm_end, 0, 0
-	song bgm_battle27, 0, 0
-	song bgm_battle31, 0, 0
-	song bgm_battle20, 0, 0
-	song bgm_battle32, 0, 0
-	song bgm_battle33, 0, 0
-	song bgm_battle36, 0, 0
-	song bgm_battle34, 0, 0
-	song bgm_battle35, 0, 0
-	song bgm_battle38, 0, 0
-	song bgm_battle30, 0, 0
-	song bgm_radio_tower_occupied, 0, 0
+	song bgm_tetsuji, 0, 0               @ Littleroot Town Test 'TETSUJI'
+	song bgm_field13, 0, 0               @ GSC - Route 38
+	song bgm_kachi22, 0, 0               @ Wild Pokémon Defeated
+	song bgm_kachi2, 0, 0                @ Wild Pokémon Defeated with Intro
+	song bgm_kachi3, 0, 0                @ Gym Leader Defeated
+	song bgm_kachi5, 0, 0                @ Victory! Elite Four
+	song bgm_pcc, 0, 0                   @ Crystal - Pokémon Communication Center
+	song bgm_nibi, 0, 0                  @ GSC - Viridian/Saffron/Pewter/etc
+	song bgm_suikun, 0, 0                @ Crystal - Battle! Legendary Beasts
+	song bgm_dooro1, 0, 0                @ Route 101
+	song bgm_dooro_x1, 0, 0              @ Route 110
+	song bgm_dooro_x3, 0, 0              @ Route 120
+	song bgm_machi_s2, 0, 0              @ Petalburg City
+	song bgm_machi_s4, 0, 0              @ Oldale Town
+	song bgm_gim, 0, 0                   @ Gym
+	song bgm_naminori, 0, 0              @ Surfing
+	song bgm_dan01, 0, 0                 @ Caves and Darkness
+	song bgm_fanfa1, 2, 2                @ Level Up!
+	song bgm_me_asa, 2, 2                @ Pokémon Healed
+	song bgm_me_bachi, 2, 2              @ Obtained a Badge!
+	song bgm_fanfa4, 2, 2                @ Obtained an Item!
+	song bgm_fanfa5, 2, 2                @ Your Pokémon Just Evolved!
+	song bgm_me_waza, 2, 2               @ Obtained a TM/HM!
+	song bgm_bijyutu, 0, 0               @ Lilycove Museum
+	song bgm_dooro_x4, 0, 0              @ Route 122/Intro
+	song bgm_fune_kan, 0, 0              @ Slateport Museum
+	song bgm_me_shinka, 2, 2             @ Evolution Intro
+	song bgm_shinka, 0, 0                @ Evolution
+	song bgm_me_wasure, 2, 2             @ Move Deleted
+	song bgm_syoujoeye, 0, 0             @ Encounter! Tuber
+	song bgm_boyeye, 0, 0                @ Encounter! Boy
+	song bgm_dan02, 0, 0                 @ Abandoned Ship
+	song bgm_machi_s3, 0, 0              @ Fortree City
+	song bgm_odamaki, 0, 0               @ Professor Birch's Lab
+	song bgm_b_tower, 0, 0               @ Battle Tower (RS)
+	song bgm_swimeye, 0, 0               @ Encounter! Swimmer
+	song bgm_dan03, 0, 0                 @ Meteor Falls
+	song bgm_me_kinomi, 2, 2             @ Obtained a Berry!
+	song bgm_me_tama, 2, 2               @ Awakening the Super-Ancient Pokémon
+	song bgm_me_b_big, 2, 2              @ Slots Jackpot!
+	song bgm_me_b_small, 2, 2            @ Slots Victory!
+	song bgm_me_zannen, 2, 2             @ Too bad!
+	song bgm_bd_time, 0, 0               @ Roulette!
+	song bgm_test1, 0, 0                 @ Contest Test 1
+	song bgm_test2, 0, 0                 @ Contest Test 2
+	song bgm_test3, 0, 0                 @ Contest Test 3
+	song bgm_test4, 0, 0                 @ Contest Test 4
+	song bgm_test, 0, 0                  @ Encounter! Gentleman (Test?)
+	song bgm_gomachi0, 0, 0              @ Verdanturf Town
+	song bgm_gotown, 0, 0                @ Rustboro City
+	song bgm_pokecen, 0, 0               @ Pokémon Center
+	song bgm_nextroad, 0, 0              @ Route 104
+	song bgm_granroad, 0, 0              @ Route 119
+	song bgm_cycling, 0, 0               @ Cycling
+	song bgm_friendly, 0, 0              @ Pokémart
+	song bgm_mishiro, 0, 0               @ Littleroot Town
+	song bgm_tozan, 0, 0                 @ Sky Pillar
+	song bgm_girleye, 0, 0               @ Encounter! Girl
+	song bgm_minamo, 0, 0                @ Lilycove City
+	song bgm_ashroad, 0, 0               @ Route 111
+	song bgm_event0, 0, 0                @ Help me!
+	song bgm_deepdeep, 0, 0              @ Underwater
+	song bgm_kachi1, 0, 0                @ Victory! Trainer
+	song bgm_title3, 0, 0                @ Title Screen
+	song bgm_demo1, 0, 0                 @ Opening Movie
+	song bgm_girl_sup, 0, 0              @ Encounter! May
+	song bgm_hageshii, 0, 0              @ Encounter! Biker
+	song bgm_kakkoii, 0, 0               @ Encounter! Electric Trainer
+	song bgm_kazanbai, 0, 0              @ Route 113
+	song bgm_aqa_0, 0, 0                 @ Encounter! Team Aqua
+	song bgm_tsuretek, 0, 0              @ Follow Me!
+	song bgm_boy_sup, 0, 0               @ Encounter! Brendan
+	song bgm_rainbow, 0, 0               @ Ever Grande City
+	song bgm_ayasii, 0, 0                @ Encounter! Psychic
+	song bgm_kachi4, 0, 0                @ Victory! Aqua/Magma Grunt
+	song bgm_ropeway, 0, 0               @ Cable Car
+	song bgm_casino, 0, 0                @ Game Corner
+	song bgm_hightown, 0, 0              @ Dewford Town
+	song bgm_safari, 0, 0                @ Safari Zone
+	song bgm_c_road, 0, 0                @ Victory Road
+	song bgm_ajito, 0, 0                 @ Aqua/Magma Hideout
+	song bgm_m_boat, 0, 0                @ Sailing
+	song bgm_m_dungon, 0, 0              @ Mt. Pyre (Inside)
+	song bgm_finecity, 0, 0              @ Slateport City
+	song bgm_machupi, 0, 0               @ Mt. Pyte (Outside)
+	song bgm_p_school, 0, 0              @ Pokémon Trainer's School
+	song bgm_dendou, 0, 0                @ Hall of Fame
+	song bgm_tonekusa, 0, 0              @ Lavaridge Town
+	song bgm_maborosi, 0, 0              @ Sealed Chamber
+	song bgm_con_fan, 0, 0               @ You are the Champion!
+	song bgm_contest0, 0, 0              @ Pokémon Contest
+	song bgm_mgm0, 0, 0                  @ Encounter! Team Magma
+	song bgm_t_battle, 0, 0              @ Opening Battle
+	song bgm_ooame, 0, 0                 @ The Flood
+	song bgm_hideri, 0, 0                @ The Drought
+	song bgm_runecity, 0, 0              @ Sootopolis City
+	song bgm_con_k, 0, 0                 @ Berry Blending Results
+	song bgm_eikou_r, 0, 0               @ Hall of Fame
+	song bgm_karakuri, 0, 0              @ Trick House
+	song bgm_hutago, 0, 0                @ Encounter! Kid
+	song bgm_sitennou, 0, 0              @ Encounter! Elite Four
+	song bgm_yama_eye, 0, 0              @ Encounter! Hiker
+	song bgm_conlobby, 0, 0              @ Contest Lobby
+	song bgm_inter_v, 0, 0               @ Encounter! Gabby and Ty
+	song bgm_daigo, 0, 0                 @ Encounter! Wallace
+	song bgm_thankfor, 0, 0              @ Credits
+	song bgm_end, 0, 0                   @ The End
+	song bgm_battle27, 0, 0              @ Battle! Wild Pokémon
+	song bgm_battle31, 0, 0              @ Battle! Team Aqua/Magma
+	song bgm_battle20, 0, 0              @ Battle! Trainer
+	song bgm_battle32, 0, 0              @ Battle! Gym Leader
+	song bgm_battle33, 0, 0              @ Battle! Champion
+	song bgm_battle36, 0, 0              @ Battle! Regi Trio
+	song bgm_battle34, 0, 0              @ Battle! Legendary Pokémon (dupe)
+	song bgm_battle35, 0, 0              @ Battle! Rival
+	song bgm_battle38, 0, 0              @ Battle! Elite Four
+	song bgm_battle30, 0, 0              @ Battle! Archie/Maxie
+	song bgm_radio_tower_occupied, 0, 0  @ GSC - Radio Tower Takeover!
 
 	.align 2
-dummy_song_header: @ 845632C
+dummy_song_header:      @ 845632C
 	.byte 0, 0, 0, 0