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

Ported from my work in pokeemerald.

2 files changed, 710 insertions, 710 deletions

diff --git a/include/constants/songs.h b/include/constants/songs.h
index 5225f5899..59c69b16e 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -2,371 +2,371 @@
 #define GUARD_CONSTANTS_SONGS_H
 
 #define SE_STOP 0
-#define SE_KAIFUKU 1
-#define SE_PC_LOGON 2
-#define SE_PC_OFF 3
-#define SE_PC_ON 4
-#define SE_SELECT 5
-#define SE_WIN_OPEN 6
-#define SE_WALL_HIT 7
-#define SE_DOOR 8
-#define SE_KAIDAN 9
-#define SE_DANSA 10
-#define SE_JITENSYA 11
-#define SE_KOUKA_L 12
-#define SE_KOUKA_M 13
-#define SE_KOUKA_H 14
-#define SE_BOWA2 15
-#define SE_POKE_DEAD 16
-#define SE_NIGERU 17
-#define SE_JIDO_DOA 18
-#define SE_NAMINORI 19
-#define SE_BAN 20
-#define SE_PIN 21
-#define SE_BOO 22
-#define SE_BOWA 23
-#define SE_JYUNI 24
-#define SE_A 25
-#define SE_I 26
-#define SE_U 27
-#define SE_E 28
-#define SE_O 29
-#define SE_N 30
-#define SE_SEIKAI 31
-#define SE_HAZURE 32
-#define SE_EXP 33
-#define SE_JITE_PYOKO 34
+#define SE_KAIFUKU 1            // Healing Item
+#define SE_PC_LOGON 2           // PC Logon
+#define SE_PC_OFF 3             // PC Shutdown
+#define SE_PC_ON 4              // PC Startup
+#define SE_SELECT 5             // Cursor Selection
+#define SE_WIN_OPEN 6           // Start Menu
+#define SE_WALL_HIT 7           // Wall Bump
+#define SE_DOOR 8               // Opening Door
+#define SE_KAIDAN 9             // Stairs
+#define SE_DANSA 10             // Ledge
+#define SE_JITENSYA 11          // Bicycle Bell
+#define SE_KOUKA_L 12           // Not Very Effective
+#define SE_KOUKA_M 13           // Normal Effectiveness
+#define SE_KOUKA_H 14           // Super Effective
+#define SE_BOWA2 15             // Pokémon Withdrawl
+#define SE_POKE_DEAD 16         // Pokémon Fainted
+#define SE_NIGERU 17            // Flee from Wild Battle
+#define SE_JIDO_DOA 18          // Pokémon Center Door
+#define SE_NAMINORI 19          // Briney's Ship
+#define SE_BAN 20               // Bang
+#define SE_PIN 21               // Exclamation Bubble
+#define SE_BOO 22               // Contest Jam
+#define SE_BOWA 23              // Giving Poké Ball to Nurse, Poké Ball Wiggle
+#define SE_JYUNI 24             // Places in Contest Appearing
+#define SE_A 25                 // Bard A
+#define SE_I 26                 // Bard I
+#define SE_U 27                 // Bard U
+#define SE_E 28                 // Bard E
+#define SE_O 29                 // Bard O
+#define SE_N 30                 // Bard N
+#define SE_SEIKAI 31            // Success
+#define SE_HAZURE 32            // Failure
+#define SE_EXP 33               // Exp. Bar
+#define SE_JITE_PYOKO 34        // Bunny Hop
 #define SE_MU_PACHI 35
-#define SE_TK_KASYA 36
+#define SE_TK_KASYA 36          // Mossdeep Gym/Trick House Switch
 #define SE_FU_ZAKU 37
 #define SE_FU_ZAKU2 38
-#define SE_FU_ZUZUZU 39
-#define SE_RU_GASHIN 40
-#define SE_RU_GASYAN 41
-#define SE_RU_BARI 42
-#define SE_RU_HYUU 43
+#define SE_FU_ZUZUZU 39         // Lavaridge Gym Warp
+#define SE_RU_GASHIN 40         // Sootopolis Gym - Stairs Appear
+#define SE_RU_GASYAN 41         // Sootopolis Gym - Ice Breaking
+#define SE_RU_BARI 42           // Sootopolis Gym - Stepping on Ice
+#define SE_RU_HYUU 43           // Falling Down
 #define SE_KI_GASYAN 44
-#define SE_TK_WARPIN 45
-#define SE_TK_WARPOUT 46
-#define SE_TU_SAA 47
-#define SE_HI_TURUN 48
-#define SE_TRACK_MOVE 49
-#define SE_TRACK_STOP 50
-#define SE_TRACK_HAIK 51
-#define SE_TRACK_DOOR 52
+#define SE_TK_WARPIN 45         // Warp In
+#define SE_TK_WARPOUT 46        // Warp Out
+#define SE_TU_SAA 47            // Repel
+#define SE_HI_TURUN 48          // Moving Obstacle in Fortree Gym
+#define SE_TRACK_MOVE 49        // Moving Truck
+#define SE_TRACK_STOP 50        // Moving Truck Stop
+#define SE_TRACK_HAIK 51        // Moving Truck Unload
+#define SE_TRACK_DOOR 52        // Moving Truck Door
 #define SE_MOTER 53
 #define SE_CARD 54
-#define SE_SAVE 55
-#define SE_KON 56
-#define SE_KON2 57
-#define SE_KON3 58
-#define SE_KON4 59
-#define SE_SUIKOMU 60
-#define SE_NAGERU 61
-#define SE_TOY_C 62
-#define SE_TOY_D 63
-#define SE_TOY_E 64
-#define SE_TOY_F 65
-#define SE_TOY_G 66
-#define SE_TOY_A 67
-#define SE_TOY_B 68
-#define SE_TOY_C1 69
-#define SE_MIZU 70
-#define SE_HASHI 71
-#define SE_DAUGI 72
-#define SE_PINPON 73
-#define SE_FUUSEN1 74
-#define SE_FUUSEN2 75
-#define SE_FUUSEN3 76
-#define SE_TOY_KABE 77
-#define SE_TOY_DANGO 78
-#define SE_DOKU 79
-#define SE_ESUKA 80
-#define SE_T_AME 81
-#define SE_T_AME_E 82
-#define SE_T_OOAME 83
-#define SE_T_OOAME_E 84
-#define SE_T_KOAME 85
-#define SE_T_KOAME_E 86
-#define SE_T_KAMI 87
-#define SE_T_KAMI2 88
-#define SE_ELEBETA 89
-#define SE_HINSI 90
-#define SE_EXPMAX 91
-#define SE_TAMAKORO 92
-#define SE_TAMAKORO_E 93
+#define SE_SAVE 55              // Save
+#define SE_KON 56               // Poké Ball Bounce 1
+#define SE_KON2 57              // Poké Ball Bounce 2
+#define SE_KON3 58              // Poké Ball Bounce 3
+#define SE_KON4 59              // Poké Ball Bounce 4
+#define SE_SUIKOMU 60           // Poké Ball Trade
+#define SE_NAGERU 61            // Poké Ball Throw
+#define SE_TOY_C 62             // Note C
+#define SE_TOY_D 63             // Note D
+#define SE_TOY_E 64             // Note E
+#define SE_TOY_F 65             // Note F
+#define SE_TOY_G 66             // Note G
+#define SE_TOY_A 67             // Note A
+#define SE_TOY_B 68             // Note B
+#define SE_TOY_C1 69            // Note High C
+#define SE_MIZU 70              // Puddle
+#define SE_HASHI 71             // Boardwalk
+#define SE_DAUGI 72             // Slots Credits
+#define SE_PINPON 73            // Ding-dong!
+#define SE_FUUSEN1 74           // Red Balloon
+#define SE_FUUSEN2 75           // Blue Balloon
+#define SE_FUUSEN3 76           // Yellow Balloon
+#define SE_TOY_KABE 77          // Brealable Door
+#define SE_TOY_DANGO 78         // Mud Ball
+#define SE_DOKU 79              // Overworld Poison Damage
+#define SE_ESUKA 80             // Escalator
+#define SE_T_AME 81             // Rain
+#define SE_T_AME_E 82           // Rain stop
+#define SE_T_OOAME 83           // Heavy Rain
+#define SE_T_OOAME_E 84         // Heavy Rain Stop
+#define SE_T_KOAME 85           // Light Rain
+#define SE_T_KOAME_E 86         // Light Rain Stop
+#define SE_T_KAMI 87            // Thunder
+#define SE_T_KAMI2 88           // Thunder 2
+#define SE_ELEBETA 89           // Elevator
+#define SE_HINSI 90             // Low Health
+#define SE_EXPMAX 91            // Exp. Max
+#define SE_TAMAKORO 92          // Roulette Ball
+#define SE_TAMAKORO_E 93        // Roulette Ball 2
 #define SE_BASABASA 94
-#define SE_REGI 95
-#define SE_C_GAJI 96
-#define SE_C_MAKU_U 97
-#define SE_C_MAKU_D 98
+#define SE_REGI 95              // Cash Register
+#define SE_C_GAJI 96            // Contest Hearts
+#define SE_C_MAKU_U 97          // Contest Curtain rise
+#define SE_C_MAKU_D 98          // Contest Curtain fall
 #define SE_C_PASI 99
 #define SE_C_SYU 100
-#define SE_C_PIKON 101
-#define SE_REAPOKE 102
-#define SE_OP_BASYU 103
-#define SE_BT_START 104
-#define SE_DENDOU 105
-#define SE_JIHANKI 106
-#define SE_TAMA 107
-#define SE_Z_SCROLL 108
-#define SE_Z_PAGE 109
-#define SE_PN_ON 110
-#define SE_PN_OFF 111
-#define SE_Z_SEARCH 112
-#define SE_TAMAGO 113
-#define SE_TB_START 114
-#define SE_TB_KON 115
-#define SE_TB_KARA 116
+#define SE_C_PIKON 101          // Pokémon Appears in Contest
+#define SE_REAPOKE 102          // Shiny Pokémon
+#define SE_OP_BASYU 103         // Opening Movie -> Title Screen whoosh
+#define SE_BT_START 104         // Battle Mugshot whoosh
+#define SE_DENDOU 105           // Audience Cheering
+#define SE_JIHANKI 106          // Vending Machine
+#define SE_TAMA 107             // Orb Used
+#define SE_Z_SCROLL 108         // Pokédex Scrolling
+#define SE_Z_PAGE 109           // Pokédex Page
+#define SE_PN_ON 110            // PokéNav On
+#define SE_PN_OFF 111           // PokéNav Off
+#define SE_Z_SEARCH 112         // Pokédex Search
+#define SE_TAMAGO 113           // Egg hatch
+#define SE_TB_START 114         // Battle - Poké Ball Tray slide in
+#define SE_TB_KON 115           // Battle - Poké Ball Tray ball sound
+#define SE_TB_KARA 116          // Battle - Poké Ball Tray slide out
 #define SE_BIDORO 117
-#define SE_W085 118
-#define SE_W085B 119
-#define SE_W231 120
-#define SE_W171 121
-#define SE_W233 122
-#define SE_W233B 123
-#define SE_W145 124
-#define SE_W145B 125
-#define SE_W145C 126
-#define SE_W240 127
-#define SE_W015 128
-#define SE_W081 129
-#define SE_W081B 130
-#define SE_W088 131
-#define SE_W016 132
-#define SE_W016B 133
-#define SE_W003 134
-#define SE_W104 135
-#define SE_W013 136
-#define SE_W196 137
-#define SE_W086 138
-#define SE_W004 139
-#define SE_W025 140
-#define SE_W025B 141
-#define SE_W152 142
-#define SE_W026 143
-#define SE_W172 144
-#define SE_W172B 145
-#define SE_W053 146
-#define SE_W007 147
-#define SE_W092 148
-#define SE_W221 149
-#define SE_W221B 150
-#define SE_W052 151
-#define SE_W036 152
-#define SE_W059 153
-#define SE_W059B 154
-#define SE_W010 155
-#define SE_W011 156
-#define SE_W017 157
-#define SE_W019 158
-#define SE_W028 159
-#define SE_W013B 160
-#define SE_W044 161
-#define SE_W029 162
-#define SE_W057 163
-#define SE_W056 164
-#define SE_W250 165
-#define SE_W030 166
-#define SE_W039 167
-#define SE_W054 168
-#define SE_W077 169
-#define SE_W020 170
-#define SE_W082 171
-#define SE_W047 172
-#define SE_W195 173
-#define SE_W006 174
-#define SE_W091 175
-#define SE_W146 176
-#define SE_W120 177
-#define SE_W153 178
-#define SE_W071B 179
-#define SE_W071 180
-#define SE_W103 181
-#define SE_W062 182
-#define SE_W062B 183
-#define SE_W048 184
-#define SE_W187 185
-#define SE_W118 186
-#define SE_W155 187
-#define SE_W122 188
-#define SE_W060 189
-#define SE_W185 190
-#define SE_W014 191
-#define SE_W043 192
-#define SE_W207 193
-#define SE_W207B 194
-#define SE_W215 195
-#define SE_W109 196
-#define SE_W173 197
-#define SE_W280 198
-#define SE_W202 199
-#define SE_W060B 200
-#define SE_W076 201
-#define SE_W080 202
-#define SE_W100 203
-#define SE_W107 204
-#define SE_W166 205
-#define SE_W129 206
-#define SE_W115 207
-#define SE_W112 208
-#define SE_W197 209
-#define SE_W199 210
-#define SE_W236 211
-#define SE_W204 212
-#define SE_W268 213
-#define SE_W070 214
-#define SE_W063 215
-#define SE_W127 216
-#define SE_W179 217
-#define SE_W151 218
-#define SE_W201 219
-#define SE_W161 220
-#define SE_W161B 221
-#define SE_W227 222
-#define SE_W227B 223
-#define SE_W226 224
-#define SE_W208 225
-#define SE_W213 226
-#define SE_W213B 227
-#define SE_W234 228
-#define SE_W260 229
-#define SE_W328 230
-#define SE_W320 231
-#define SE_W255 232
-#define SE_W291 233
-#define SE_W089 234
-#define SE_W239 235
-#define SE_W230 236
-#define SE_W281 237
-#define SE_W327 238
-#define SE_W287 239
-#define SE_W257 240
-#define SE_W253 241
-#define SE_W258 242
-#define SE_W322 243
-#define SE_W298 244
-#define SE_W287B 245
-#define SE_W114 246
-#define SE_W063B 247
+#define SE_W085 118             // Thunderbolt
+#define SE_W085B 119            // Thunderbolt 2
+#define SE_W231 120             // Harden
+#define SE_W171 121             // Nightmare
+#define SE_W233 122             // Vital Throw
+#define SE_W233B 123            // Vital Throw
+#define SE_W145 124             // Bubble
+#define SE_W145B 125            // Bubble 2
+#define SE_W145C 126            // Bubble 3
+#define SE_W240 127             // Rain Dance
+#define SE_W015 128             // Cut
+#define SE_W081 129             // String Shot
+#define SE_W081B 130            // String Shot 2
+#define SE_W088 131             // Rock Throw
+#define SE_W016 132             // Gust
+#define SE_W016B 133            // Gust 2
+#define SE_W003 134             // DoubleSlap
+#define SE_W104 135             // Double Team
+#define SE_W013 136             // Razor Wind
+#define SE_W196 137             // Icy Wind
+#define SE_W086 138             // Thunder Wave
+#define SE_W004 139             // Comet Punch
+#define SE_W025 140             // Mega Kick
+#define SE_W025B 141            // Mega Kick 2
+#define SE_W152 142             // Crabhammer
+#define SE_W026 143             // Jump Kick
+#define SE_W172 144             // Flame Wheel
+#define SE_W172B 145            // Flame Wheel 2
+#define SE_W053 146             // Flamethrower
+#define SE_W007 147             // Fire Punch
+#define SE_W092 148             // Toxic
+#define SE_W221 149             // Sacred Fire
+#define SE_W221B 150            // Sacred Fire 2
+#define SE_W052 151             // Ember
+#define SE_W036 152             // Take Down
+#define SE_W059 153             // Blizzard
+#define SE_W059B 154            // Blizzard 2
+#define SE_W010 155             // Scratch
+#define SE_W011 156             // Vicegrip
+#define SE_W017 157             // Wing Attack
+#define SE_W019 158             // Fly
+#define SE_W028 159             // Sand-Attack
+#define SE_W013B 160            // Razor Wind 2
+#define SE_W044 161             // Bite
+#define SE_W029 162             // Headbutt
+#define SE_W057 163             // Surf
+#define SE_W056 164             // Hydro Pump
+#define SE_W250 165             // Whirlpool
+#define SE_W030 166             // Horn Attack
+#define SE_W039 167             // Tail Whip
+#define SE_W054 168             // Mist
+#define SE_W077 169             // PoisonPowder
+#define SE_W020 170             // Bind
+#define SE_W082 171             // Dragon Rage
+#define SE_W047 172             // Sing
+#define SE_W195 173             // Perish Song
+#define SE_W006 174             // Pay Day
+#define SE_W091 175             // Dig
+#define SE_W146 176             // Dizzy Punch
+#define SE_W120 177             // Self-Destruct
+#define SE_W153 178             // Explosion
+#define SE_W071B 179            // Absorb 2
+#define SE_W071 180             // Absorb
+#define SE_W103 181             // Screech
+#define SE_W062 182             // BubbleBeam
+#define SE_W062B 183            // BubbleBeam 2
+#define SE_W048 184             // Supersonic
+#define SE_W187 185             // Belly Drum
+#define SE_W118 186             // Metronome
+#define SE_W155 187             // Bonemerang
+#define SE_W122 188             // Lick
+#define SE_W060 189             // Psybeam
+#define SE_W185 190             // Faint Attack
+#define SE_W014 191             // Swords Dance
+#define SE_W043 192             // Leer
+#define SE_W207 193             // Swagger
+#define SE_W207B 194            // Swagger 2
+#define SE_W215 195             // Heal Bell
+#define SE_W109 196             // Confuse Ray
+#define SE_W173 197             // Snore
+#define SE_W280 198             // Brick Break
+#define SE_W202 199             // Giga Drain
+#define SE_W060B 200            // Psybeam 2
+#define SE_W076 201             // SolarBeam
+#define SE_W080 202             // Petal Dance
+#define SE_W100 203             // Teleport
+#define SE_W107 204             // Minimize
+#define SE_W166 205             // Sketch
+#define SE_W129 206             // Swift
+#define SE_W115 207             // Reflect
+#define SE_W112 208             // Barrier
+#define SE_W197 209             // Detect
+#define SE_W199 210             // Lock-On
+#define SE_W236 211             // Moonlight
+#define SE_W204 212             // Charm
+#define SE_W268 213             // Charge
+#define SE_W070 214             // Strength
+#define SE_W063 215             // Hyper Beam
+#define SE_W127 216             // Waterfall
+#define SE_W179 217             // Reversal
+#define SE_W151 218             // Acid Armor
+#define SE_W201 219             // Sandstorm
+#define SE_W161 220             // Tri-Attack
+#define SE_W161B 221            // Tri-Attack 2
+#define SE_W227 222             // Encore
+#define SE_W227B 223            // Encore 2
+#define SE_W226 224             // Baton Pass
+#define SE_W208 225             // Milk Drink
+#define SE_W213 226             // Attract
+#define SE_W213B 227            // Attract 2
+#define SE_W234 228             // Morning Sun
+#define SE_W260 229             // Flatter
+#define SE_W328 230             // Sand Tomb
+#define SE_W320 231             // GrassWhistle
+#define SE_W255 232             // Spit Up
+#define SE_W291 233             // Dive
+#define SE_W089 234             // Earthquake
+#define SE_W239 235             // Twister
+#define SE_W230 236             // Sweet Scent
+#define SE_W281 237             // Yawn
+#define SE_W327 238             // Sky Uppercut
+#define SE_W287 239             // Stat Increased
+#define SE_W257 240             // Heat Wave
+#define SE_W253 241             // Uproar
+#define SE_W258 242             // Hail
+#define SE_W322 243             // Cosmic Power
+#define SE_W298 244             // Teeter Dance
+#define SE_W287B 245            // Stat Decreased
+#define SE_W114 246             // Haze
+#define SE_W063B 247            // Hyper Beam 2
 #define BGM_STOP 349
-#define BGM_TETSUJI 350
-#define BGM_FIELD13 351
-#define BGM_KACHI22 352
-#define BGM_KACHI2 353
-#define BGM_KACHI3 354
-#define BGM_KACHI5 355
-#define BGM_PCC 356
-#define BGM_NIBI 357
-#define BGM_SUIKUN 358
-#define BGM_DOORO1 359
-#define BGM_DOORO_X1 360
-#define BGM_DOORO_X3 361
-#define BGM_MACHI_S2 362
-#define BGM_MACHI_S4 363
-#define BGM_GIM 364
-#define BGM_NAMINORI 365
-#define BGM_DAN01 366
-#define BGM_FANFA1 367
-#define BGM_ME_ASA 368
-#define BGM_ME_BACHI 369
-#define BGM_FANFA4 370
-#define BGM_FANFA5 371
-#define BGM_ME_WAZA 372
-#define BGM_BIJYUTU 373
-#define BGM_DOORO_X4 374
-#define BGM_FUNE_KAN 375
-#define BGM_ME_SHINKA 376
-#define BGM_SHINKA 377
-#define BGM_ME_WASURE 378
-#define BGM_SYOUJOEYE 379
-#define BGM_BOYEYE 380
-#define BGM_DAN02 381
-#define BGM_MACHI_S3 382
-#define BGM_ODAMAKI 383
-#define BGM_B_TOWER 384
-#define BGM_SWIMEYE 385
-#define BGM_DAN03 386
-#define BGM_ME_KINOMI 387
-#define BGM_ME_TAMA 388
-#define BGM_ME_B_BIG 389
-#define BGM_ME_B_SMALL 390
-#define BGM_ME_ZANNEN 391
-#define BGM_BD_TIME 392
-#define BGM_TEST1 393
-#define BGM_TEST2 394
-#define BGM_TEST3 395
-#define BGM_TEST4 396
-#define BGM_TEST 397
-#define BGM_GOMACHI0 398
-#define BGM_GOTOWN 399
-#define BGM_POKECEN 400
-#define BGM_NEXTROAD 401
-#define BGM_GRANROAD 402
-#define BGM_CYCLING 403
-#define BGM_FRIENDLY 404
-#define BGM_MISHIRO 405
-#define BGM_TOZAN 406
-#define BGM_GIRLEYE 407
-#define BGM_MINAMO 408
-#define BGM_ASHROAD 409
-#define BGM_EVENT0 410
-#define BGM_DEEPDEEP 411
-#define BGM_KACHI1 412
-#define BGM_TITLE3 413
-#define BGM_DEMO1 414
-#define BGM_GIRL_SUP 415
-#define BGM_HAGESHII 416
-#define BGM_KAKKOII 417
-#define BGM_KAZANBAI 418
-#define BGM_AQA_0 419
-#define BGM_TSURETEK 420
-#define BGM_BOY_SUP 421
-#define BGM_RAINBOW 422
-#define BGM_AYASII 423
-#define BGM_KACHI4 424
-#define BGM_ROPEWAY 425
-#define BGM_CASINO 426
-#define BGM_HIGHTOWN 427
-#define BGM_SAFARI 428
-#define BGM_C_ROAD 429
-#define BGM_AJITO 430
-#define BGM_M_BOAT 431
-#define BGM_M_DUNGON 432
-#define BGM_FINECITY 433
-#define BGM_MACHUPI 434
-#define BGM_P_SCHOOL 435
-#define BGM_DENDOU 436
-#define BGM_TONEKUSA 437
-#define BGM_MABOROSI 438
-#define BGM_CON_FAN 439
-#define BGM_CONTEST0 440
-#define BGM_MGM0 441
-#define BGM_T_BATTLE 442
-#define BGM_OOAME 443
-#define BGM_HIDERI 444
-#define BGM_RUNECITY 445
-#define BGM_CON_K 446
-#define BGM_EIKOU_R 447
-#define BGM_KARAKURI 448
-#define BGM_HUTAGO 449
-#define BGM_SITENNOU 450
-#define BGM_YAMA_EYE 451
-#define BGM_CONLOBBY 452
-#define BGM_INTER_V 453
-#define BGM_DAIGO 454
-#define BGM_THANKFOR 455
-#define BGM_END 456
-#define BGM_BATTLE27 457
-#define BGM_BATTLE31 458
-#define BGM_BATTLE20 459
-#define BGM_BATTLE32 460
-#define BGM_BATTLE33 461
-#define BGM_BATTLE36 462
-#define BGM_BATTLE34 463
-#define BGM_BATTLE35 464
-#define BGM_BATTLE38 465
-#define BGM_BATTLE30 466
+#define BGM_TETSUJI 350         // Littleroot Town Test 'TETSUJI'
+#define BGM_FIELD13 351         // GSC - Route 38
+#define BGM_KACHI22 352         // Wild Pokémon Defeated
+#define BGM_KACHI2 353          // Wild Pokémon Defeated with Intro
+#define BGM_KACHI3 354          // Gym Leader Defeated
+#define BGM_KACHI5 355          // Victory! Elite Four
+#define BGM_PCC 356             // Crystal - Pokémon Communication Center
+#define BGM_NIBI 357            // GSC - Viridian/Saffron/Pewter/etc
+#define BGM_SUIKUN 358          // Crystal - Battle! Legendary Beasts
+#define BGM_DOORO1 359          // Route 101
+#define BGM_DOORO_X1 360        // Route 110
+#define BGM_DOORO_X3 361        // Route 120
+#define BGM_MACHI_S2 362        // Petalburg City
+#define BGM_MACHI_S4 363        // Oldale Town
+#define BGM_GIM 364             // Gym
+#define BGM_NAMINORI 365        // Surfing
+#define BGM_DAN01 366           // Caves and Darkness
+#define BGM_FANFA1 367          // Level Up!
+#define BGM_ME_ASA 368          // Pokémon Healed
+#define BGM_ME_BACHI 369        // Obtained a Badge!
+#define BGM_FANFA4 370          // Obtained an Item!
+#define BGM_FANFA5 371          // Your Pokémon Just Evolved!
+#define BGM_ME_WAZA 372         // Obtained a TM/HM!
+#define BGM_BIJYUTU 373         // Lilycove Musseum
+#define BGM_DOORO_X4 374        // Route 122/Intro
+#define BGM_FUNE_KAN 375        // Slateport Museum
+#define BGM_ME_SHINKA 376       // Evolution Intro
+#define BGM_SHINKA 377          // Evolution
+#define BGM_ME_WASURE 378       // Move Deleted
+#define BGM_SYOUJOEYE 379       // Encounter! Tuber
+#define BGM_BOYEYE 380          // Encounter! Boy
+#define BGM_DAN02 381           // Abandoned Ship
+#define BGM_MACHI_S3 382        // Fortree City
+#define BGM_ODAMAKI 383         // Professor Birch's Lab
+#define BGM_B_TOWER 384         // Battle Tower (RS)
+#define BGM_SWIMEYE 385         // Encounter! Swimmer
+#define BGM_DAN03 386           // Meteor Falls
+#define BGM_ME_KINOMI 387       // Obtained a Berry!
+#define BGM_ME_TAMA 388         // Awakening the Super-Ancient Pokémon
+#define BGM_ME_B_BIG 389        // Slots Jackpot!
+#define BGM_ME_B_SMALL 390      // Slots Victory!
+#define BGM_ME_ZANNEN 391       // Too bad!
+#define BGM_BD_TIME 392         // Roulette!
+#define BGM_TEST1 393           // Contest Test 1
+#define BGM_TEST2 394           // Contest Test 2
+#define BGM_TEST3 395           // Contest Test 3
+#define BGM_TEST4 396           // Contest Test 4
+#define BGM_TEST 397            // Encounter! Gentleman (Test?)
+#define BGM_GOMACHI0 398        // Verdanturf Town
+#define BGM_GOTOWN 399          // Rustboro City
+#define BGM_POKECEN 400         // Pokémon Center
+#define BGM_NEXTROAD 401        // Route 104
+#define BGM_GRANROAD 402        // Route 119
+#define BGM_CYCLING 403         // Cycling
+#define BGM_FRIENDLY 404        // Pokémart
+#define BGM_MISHIRO 405         // Littleroot Town
+#define BGM_TOZAN 406           // Sky Pillar
+#define BGM_GIRLEYE 407         // Encounter! Girl
+#define BGM_MINAMO 408          // Lilycove City
+#define BGM_ASHROAD 409         // Route 111
+#define BGM_EVENT0 410          // Help me!
+#define BGM_DEEPDEEP 411        // Underwater
+#define BGM_KACHI1 412          // Victory! Trainer
+#define BGM_TITLE3 413          // Title Screen
+#define BGM_DEMO1 414           // Opening Movie
+#define BGM_GIRL_SUP 415        // Encounter! May
+#define BGM_HAGESHII 416        // Encounter! Biker
+#define BGM_KAKKOII 417         // Encounter! Electric Trainer
+#define BGM_KAZANBAI 418        // Route 113
+#define BGM_AQA_0 419           // Encounter! Team Aqua
+#define BGM_TSURETEK 420        // Follow Me!
+#define BGM_BOY_SUP 421         // Encounter! Brendan
+#define BGM_RAINBOW 422         // Ever Grande City
+#define BGM_AYASII 423          // Encounter! Psychic
+#define BGM_KACHI4 424          // Victory! Aqua/Magma Grunt
+#define BGM_ROPEWAY 425         // Cable Car
+#define BGM_CASINO 426          // Game Corner
+#define BGM_HIGHTOWN 427        // Dewford Town
+#define BGM_SAFARI 428          // Safari Zone
+#define BGM_C_ROAD 429          // Victory Toad
+#define BGM_AJITO 430           // Aqua/Magma Hideout
+#define BGM_M_BOAT 431          // Sailing
+#define BGM_M_DUNGON 432        // Mt. Pyre (Inside)
+#define BGM_FINECITY 433        // Slateport City
+#define BGM_MACHUPI 434         // Mt. Pyre (Outside)
+#define BGM_P_SCHOOL 435        // Pokémon Trainer's School
+#define BGM_DENDOU 436          // Hall of Fame
+#define BGM_TONEKUSA 437        // Lavaridge Town
+#define BGM_MABOROSI 438        // Sealed Chamber
+#define BGM_CON_FAN 439         // You are the Champion!
+#define BGM_CONTEST0 440        // Pokémon Contest
+#define BGM_MGM0 441            // Encounter! Team Magma
+#define BGM_T_BATTLE 442        // Opening Battle
+#define BGM_OOAME 443           // The Flood
+#define BGM_HIDERI 444          // The Drought
+#define BGM_RUNECITY 445        // Sootopolis City
+#define BGM_CON_K 446           // Berry Blending Results
+#define BGM_EIKOU_R 447         // Hall of Fame
+#define BGM_KARAKURI 448        // Trick House
+#define BGM_HUTAGO 449          // Encounter! Kid
+#define BGM_SITENNOU 450        // Encounter! Elite Four
+#define BGM_YAMA_EYE 451        // Encounter! Hiker
+#define BGM_CONLOBBY 452        // Contest Lobby
+#define BGM_INTER_V 453         // Encounter! Gabby and Ty
+#define BGM_DAIGO 454           // Encounter! Wallace
+#define BGM_THANKFOR 455        // Credits
+#define BGM_END 456             // The End
+#define BGM_BATTLE27 457        // Battle! Wild Pokémon
+#define BGM_BATTLE31 458        // Battle! Team Aqua/Magma
+#define BGM_BATTLE20 459        // Battle! Trainer
+#define BGM_BATTLE32 460        // Battle! Gym Leader
+#define BGM_BATTLE33 461        // Battle! Champion
+#define BGM_BATTLE36 462        // Battle! Regi Trio
+#define BGM_BATTLE34 463        // Battle! Legendary Pokémon
+#define BGM_BATTLE35 464        // Battle! Rival
+#define BGM_BATTLE38 465        // Battle! Elite Four
+#define BGM_BATTLE30 466        // Battle! Archie/Maxie
 
 #define BGM_ROUTE_118 0x7FFF  // What is this for?
 
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