1 files changed, 287 insertions, 214 deletions

diff --git a/include/constants/songs.h b/include/constants/songs.h
index 2e3adcbbf..fdecff09a 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_CONSTANTS_SONGS_H
 #define GUARD_CONSTANTS_SONGS_H
 
-#define SE_STOP 0
+#define MUS_DUMMY 0
 #define SE_KAIFUKU 1
-#define SE_PC_LOGON 2
+#define SE_PC_LOGIN 2
 #define SE_PC_OFF 3
 #define SE_PC_ON 4
 #define SE_SELECT 5
@@ -52,7 +52,7 @@
 #define SE_HI_TURUN 48
 #define SE_TRACK_MOVE 49
 #define SE_TRACK_STOP 50
-#define SE_TRACK_HAIK 51
+#define SE_TRACK_HAIKI 51
 #define SE_TRACK_DOOR 52
 #define SE_MOTER 53
 #define SE_CARD 54
@@ -249,217 +249,290 @@
 #define SE_W287B 245
 #define SE_W114 246
 #define SE_W063B 247
-#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_BATTLE_FRONTIER 457
-#define BGM_BATTLE_ARENA 458
-#define BGM_ME_BATTLE_POINTS 459
-#define BGM_ME_MATCH_CALL 460
-#define BGM_BATTLE_PYRAMID 461
-#define BGM_BATTLE_PYRAMID_SUMMIT 462
-#define BGM_BATTLE_PALACE 463
-#define BGM_FANFA_RAYQUAZA 464
-#define BGM_BATTLE_TOWER 465
-#define BGM_ME_BATTLE_SYMBOL 466
-#define BGM_BATTLE_DOME_TOURNAMENT 467
-#define BGM_BATTLE_PIKE 468
-#define BGM_BATTLE_FACTORY 469
-#define BGM_BATTLE_LEGENDARY 470
-#define BGM_BATTLE_FRONTIER_BRAIN 471
-#define BGM_BATTLE_MEW 472
-#define BGM_BATTLE_DOME 473
-#define BGM_BATTLE27 474
-#define BGM_BATTLE31 475
-#define BGM_BATTLE20 476
-#define BGM_BATTLE32 477
-#define BGM_BATTLE33 478
-#define BGM_BATTLE36 479
-#define BGM_BATTLE34 480
-#define BGM_BATTLE35 481
-#define BGM_BATTLE38 482
-#define BGM_BATTLE30 483
-#define BGM_FRLG_FOLLOW_ME 484
-#define BGM_FRLG_GAMECORNER 485
-#define BGM_FRLG_ROCKET_HIDEOUT 486
-#define BGM_FRLG_GYM 487
-#define BGM_FRLG_JIGGLYPUFF 488
-#define BGM_FRLG_OPENING 489
-#define BGM_FRLG_TITLE 490
-#define BGM_FRLG_CINNABAR_ISLAND 491
-#define BGM_FRLG_LAVENDER_TOWN 492
-#define BGM_FRLG_HEALING_TEST 493
-#define BGM_FRLG_BICYCLE 494
-#define BGM_FRLG_SUSPICIOUS_EYE 495
-#define BGM_FRLG_GIRL_EYE 496
-#define BGM_FRLG_BOY_EYE 497
-#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 498
-#define BGM_FRLG_VIRIDIAN_FOREST 499
-#define BGM_FRLG_MT_MOON 500
-#define BGM_FRLG_POKEMON_MANSION 501
-#define BGM_FRLG_CREDITS 502
-#define BGM_FRLG_ROUTE_1 503
-#define BGM_FRLG_ROUTE_24 504
-#define BGM_FRLG_ROUTE_3 505
-#define BGM_FRLG_ROUTE_11 506
-#define BGM_FRLG_INDIGO_PLATEAU 507
-#define BGM_FRLG_BATTLE_LEADER 508
-#define BGM_FRLG_BATTLE_TRAINER 509
-#define BGM_FRLG_BATTLE_WILD_POKEMON 510
-#define BGM_FRLG_BATTLE_CHAMPION 511
-#define BGM_FRLG_PALLET_TOWN 512
-#define BGM_FRLG_OAK_LAB 513
-#define BGM_FRLG_PROF_OAK 514
-#define BGM_FRLG_POKEMON_CENTER 515
-#define BGM_FRLG_SS_ANNE 516
-#define BGM_FRLG_SURF 517
-#define BGM_FRLG_POKEMON_TOWER 518
-#define BGM_FRLG_SILPH 519
-#define BGM_FRLG_CERULEAN_CITY 520
-#define BGM_FRLG_CELADON_CITY 521
-#define BGM_FRLG_KACHI_TRAINER 522
-#define BGM_FRLG_KACHI_WILD_POKEMON 523
-#define BGM_FRLG_KACHI_LEADER 524
-#define BGM_FRLG_VERMILION_CITY 525
-#define BGM_FRLG_VIRIDIAN_CITY 526
-#define BGM_FRLG_RIVAL 527
-#define BGM_FRLG_RIVAL_POSTBATTLE 528
-#define BGM_FRLG_ME_POKEDEX_EVAL 529
-#define BGM_FRLG_ME_KEYITEM 530
-#define BGM_FRLG_FANFA_POKEMON_CAUGHT 531
-#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 532
-#define BGM_FRLG_GAMEFREAK_LOGO 533
-#define BGM_FRLG_CAUGHT_POKEMON 534
-#define BGM_FRLG_GAME_EXPLANATION_START 535
-#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 536
-#define BGM_FRLG_GAME_EXPLANATION_END 537
-#define BGM_FRLG_POKEMON_JUMP 538
-#define BGM_FRLG_UNION_ROOM 539
-#define BGM_FRLG_POKEMON_NETWORK_CENTER 540
-#define BGM_FRLG_MYSTERY_GIFT 541
-#define BGM_FRLG_DODRIO_BERRY_PICK 542
-#define BGM_FRLG_MT_EMBER 543
-#define BGM_FRLG_TEACHY_TV_EPISODE 544
-#define BGM_FRLG_SEVII_ISLANDS 545
-#define BGM_FRLG_TANOBY_RUINS 546
-#define BGM_FRLG_ISLAND_ONE 547
-#define BGM_FRLG_ISLAND_FOUR 548
-#define BGM_FRLG_ISLAND_SIX 549
-#define BGM_FRLG_FLUTE 550
-#define BGM_FRLG_BATTLE_DEOXYS 551
-#define BGM_FRLG_BATTLE_MEWTWO 552
-#define BGM_FRLG_BATTLE_LEGENDARY 553
-#define BGM_FRLG_LEADER_EYE 554
-#define BGM_FRLG_DEOXYS_EYE 555
-#define BGM_FRLG_TRAINER_TOWER 556
-#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 557
-#define BGM_FRLG_TEACHY_TV 558
+#define SE_RG_W_DOOR 248
+#define SE_RG_CARD1 249
+#define SE_RG_CARD2 250
+#define SE_RG_CARD3 251
+#define SE_RG_BAG1 252
+#define SE_RG_BAG2 253
+#define SE_RG_GETTING 254
+#define SE_RG_SHOP 255
+#define SE_RG_KITEKI 256
+#define SE_RG_HELP_OP 257
+#define SE_RG_HELP_CL 258
+#define SE_RG_HELP_NG 259
+#define SE_RG_DEOMOV 260
+#define SE_RG_EXCELLENT 261
+#define SE_RG_NAWAMISS 262
+#define SE_TOREEYE 263
+#define SE_TOREOFF 264
+#define SE_HANTEI1 265
+#define SE_HANTEI2 266
+#define SE_CURTAIN 267
+#define SE_CURTAIN1 268
+#define SE_USSOKI 269
 
-#define BGM_ROUTE_118 0x7FFF  // What is this for?
+#define MUS_TETSUJI 350
+#define MUS_FIELD13 351
+#define MUS_KACHI22 352
+#define MUS_KACHI2 353
+#define MUS_KACHI3 354
+#define MUS_KACHI5 355
+#define MUS_PCC 356
+#define MUS_NIBI 357
+#define MUS_SUIKUN 358
+#define MUS_DOORO1 359
+#define MUS_DOORO_X1 360
+#define MUS_DOORO_X3 361
+#define MUS_MACHI_S2 362
+#define MUS_MACHI_S4 363
+#define MUS_GIM 364
+#define MUS_NAMINORI 365
+#define MUS_DAN01 366
+#define MUS_FANFA1 367
+#define MUS_ME_ASA 368
+#define MUS_ME_BACHI 369
+#define MUS_FANFA4 370
+#define MUS_FANFA5 371
+#define MUS_ME_WAZA 372
+#define MUS_BIJYUTU 373
+#define MUS_DOORO_X4 374
+#define MUS_FUNE_KAN 375
+#define MUS_ME_SHINKA 376
+#define MUS_SHINKA 377
+#define MUS_ME_WASURE 378
+#define MUS_SYOUJOEYE 379
+#define MUS_BOYEYE 380
+#define MUS_DAN02 381
+#define MUS_MACHI_S3 382
+#define MUS_ODAMAKI 383
+#define MUS_B_TOWER 384
+#define MUS_SWIMEYE 385
+#define MUS_DAN03 386
+#define MUS_ME_KINOMI 387
+#define MUS_ME_TAMA 388
+#define MUS_ME_B_BIG 389
+#define MUS_ME_B_SMALL 390
+#define MUS_ME_ZANNEN 391
+#define MUS_BD_TIME 392
+#define MUS_TEST1 393
+#define MUS_TEST2 394
+#define MUS_TEST3 395
+#define MUS_TEST4 396
+#define MUS_TEST 397
+#define MUS_GOMACHI0 398
+#define MUS_GOTOWN 399
+#define MUS_POKECEN 400
+#define MUS_NEXTROAD 401
+#define MUS_GRANROAD 402
+#define MUS_CYCLING 403
+#define MUS_FRIENDLY 404
+#define MUS_MISHIRO 405
+#define MUS_TOZAN 406
+#define MUS_GIRLEYE 407
+#define MUS_MINAMO 408
+#define MUS_ASHROAD 409
+#define MUS_EVENT0 410
+#define MUS_DEEPDEEP 411
+#define MUS_KACHI1 412
+#define MUS_TITLE3 413
+#define MUS_DEMO1 414
+#define MUS_GIRL_SUP 415
+#define MUS_HAGESHII 416
+#define MUS_KAKKOII 417
+#define MUS_KAZANBAI 418
+#define MUS_AQA_0 419
+#define MUS_TSURETEK 420
+#define MUS_BOY_SUP 421
+#define MUS_RAINBOW 422
+#define MUS_AYASII 423
+#define MUS_KACHI4 424
+#define MUS_ROPEWAY 425
+#define MUS_CASINO 426
+#define MUS_HIGHTOWN 427
+#define MUS_SAFARI 428
+#define MUS_C_ROAD 429
+#define MUS_AJITO 430
+#define MUS_M_BOAT 431
+#define MUS_M_DUNGON 432
+#define MUS_FINECITY 433
+#define MUS_MACHUPI 434
+#define MUS_P_SCHOOL 435
+#define MUS_DENDOU 436
+#define MUS_TONEKUSA 437
+#define MUS_MABOROSI 438
+#define MUS_CON_FAN 439
+#define MUS_CONTEST0 440
+#define MUS_MGM0 441
+#define MUS_T_BATTLE 442
+#define MUS_OOAME 443
+#define MUS_HIDERI 444
+#define MUS_RUNECITY 445
+#define MUS_CON_K 446
+#define MUS_EIKOU_R 447
+#define MUS_KARAKURI 448
+#define MUS_HUTAGO 449
+#define MUS_SITENNOU 450
+#define MUS_YAMA_EYE 451
+#define MUS_CONLOBBY 452
+#define MUS_INTER_V 453
+#define MUS_DAIGO 454
+#define MUS_THANKFOR 455
+#define MUS_END 456
+#define MUS_B_FRONTIER 457
+#define MUS_B_ARENA 458
+#define MUS_ME_POINTGET 459
+#define MUS_ME_TORE_EYE 460
+#define MUS_PYRAMID 461
+#define MUS_PYRAMID_TOP 462
+#define MUS_B_PALACE 463
+#define MUS_REKKUU_KOURIN 464
+#define MUS_SATTOWER 465
+#define MUS_ME_SYMBOLGET 466
+#define MUS_B_DOME 467
+#define MUS_B_TUBE 468
+#define MUS_B_FACTORY 469
+#define MUS_VS_REKKU 470
+#define MUS_VS_FRONT 471
+#define MUS_VS_MEW 472
+#define MUS_B_DOME1 473
+#define MUS_BATTLE27 474
+#define MUS_BATTLE31 475
+#define MUS_BATTLE20 476
+#define MUS_BATTLE32 477
+#define MUS_BATTLE33 478
+#define MUS_BATTLE36 479
+#define MUS_BATTLE34 480
+#define MUS_BATTLE35 481
+#define MUS_BATTLE38 482
+#define MUS_BATTLE30 483
+#define MUS_RG_ANNAI 484
+#define MUS_RG_SLOT 485
+#define MUS_RG_AJITO 486
+#define MUS_RG_GYM 487
+#define MUS_RG_PURIN 488
+#define MUS_RG_DEMO 489
+#define MUS_RG_TITLE 490
+#define MUS_RG_GUREN 491
+#define MUS_RG_SHION 492
+#define MUS_RG_KAIHUKU 493
+#define MUS_RG_CYCLING 494
+#define MUS_RG_ROCKET 495
+#define MUS_RG_SHOUJO 496
+#define MUS_RG_SHOUNEN 497
+#define MUS_RG_DENDOU 498
+#define MUS_RG_T_MORI 499
+#define MUS_RG_OTSUKIMI 500
+#define MUS_RG_POKEYASHI 501
+#define MUS_RG_ENDING 502
+#define MUS_RG_LOAD01 503
+#define MUS_RG_OPENING 504
+#define MUS_RG_LOAD02 505
+#define MUS_RG_LOAD03 506
+#define MUS_RG_CHAMP_R 507
+#define MUS_RG_VS_GYM 508
+#define MUS_RG_VS_TORE 509
+#define MUS_RG_VS_YASEI 510
+#define MUS_RG_VS_LAST 511
+#define MUS_RG_MASARA 512
+#define MUS_RG_KENKYU 513
+#define MUS_RG_OHKIDO 514
+#define MUS_RG_POKECEN 515
+#define MUS_RG_SANTOAN 516
+#define MUS_RG_NAMINORI 517
+#define MUS_RG_P_TOWER 518
+#define MUS_RG_SHIRUHU 519
+#define MUS_RG_HANADA 520
+#define MUS_RG_TAMAMUSI 521
+#define MUS_RG_WIN_TRE 522
+#define MUS_RG_WIN_YASEI 523
+#define MUS_RG_WIN_GYM 524
+#define MUS_RG_KUCHIBA 525
+#define MUS_RG_NIBI 526
+#define MUS_RG_RIVAL1 527
+#define MUS_RG_RIVAL2 528
+#define MUS_RG_FAN2 529
+#define MUS_RG_FAN5 530
+#define MUS_RG_FAN6 531
+#define MUS_ME_RG_PHOTO 532
+#define MUS_RG_TITLEROG 533
+#define MUS_RG_GET_YASEI 534
+#define MUS_RG_SOUSA 535
+#define MUS_RG_SEKAIKAN 536
+#define MUS_RG_SEIBETU 537
+#define MUS_RG_JUMP 538
+#define MUS_RG_UNION 539
+#define MUS_RG_NETWORK 540
+#define MUS_RG_OKURIMONO 541
+#define MUS_RG_KINOMIKUI 542
+#define MUS_RG_NANADUNGEON 543
+#define MUS_RG_OSHIE_TV 544
+#define MUS_RG_NANASHIMA 545
+#define MUS_RG_NANAISEKI 546
+#define MUS_RG_NANA123 547
+#define MUS_RG_NANA45 548
+#define MUS_RG_NANA67 549
+#define MUS_RG_POKEFUE 550
+#define MUS_RG_VS_DEO 551
+#define MUS_RG_VS_MYU2 552
+#define MUS_RG_VS_DEN 553
+#define MUS_RG_EXEYE 554
+#define MUS_RG_DEOEYE 555
+#define MUS_RG_T_TOWER 556
+#define MUS_RG_SLOWMASARA 557
+#define MUS_RG_TVNOIZE 558
+#define PH_TRAP_BLEND 559
+#define PH_TRAP_HELD 560
+#define PH_TRAP_SOLO 561
+#define PH_FACE_BLEND 562
+#define PH_FACE_HELD 563
+#define PH_FACE_SOLO 564
+#define PH_CLOTH_BLEND 565
+#define PH_CLOTH_HELD 566
+#define PH_CLOTH_SOLO 567
+#define PH_DRESS_BLEND 568
+#define PH_DRESS_HELD 569
+#define PH_DRESS_SOLO 570
+#define PH_FLEECE_BLEND 571
+#define PH_FLEECE_HELD 572
+#define PH_FLEECE_SOLO 573
+#define PH_KIT_BLEND 574
+#define PH_KIT_HELD 575
+#define PH_KIT_SOLO 576
+#define PH_PRICE_BLEND 577
+#define PH_PRICE_HELD 578
+#define PH_PRICE_SOLO 579
+#define PH_LOT_BLEND 580
+#define PH_LOT_HELD 581
+#define PH_LOT_SOLO 582
+#define PH_GOAT_BLEND 583
+#define PH_GOAT_HELD 584
+#define PH_GOAT_SOLO 585
+#define PH_THOUGHT_BLEND 586
+#define PH_THOUGHT_HELD 587
+#define PH_THOUGHT_SOLO 588
+#define PH_CHOICE_BLEND 589
+#define PH_CHOICE_HELD 590
+#define PH_CHOICE_SOLO 591
+#define PH_MOUTH_BLEND 592
+#define PH_MOUTH_HELD 593
+#define PH_MOUTH_SOLO 594
+#define PH_FOOT_BLEND 595
+#define PH_FOOT_HELD 596
+#define PH_FOOT_SOLO 597
+#define PH_GOOSE_BLEND 598
+#define PH_GOOSE_HELD 599
+#define PH_GOOSE_SOLO 600
+#define PH_STRUT_BLEND 601
+#define PH_STRUT_HELD 602
+#define PH_STRUT_SOLO 603
+#define PH_CURE_BLEND 604
+#define PH_CURE_HELD 605
+#define PH_CURE_SOLO 606
+#define PH_NURSE_BLEND 607
+#define PH_NURSE_HELD 608
+#define PH_NURSE_SOLO 609
+
+#define MUS_ROUTE_118 0x7FFF  // What is this for?
 
 #endif  // GUARD_CONSTANTS_SONGS_H