From 9c84e8fd565b074496a7904ae8a367822405bdbf Mon Sep 17 00:00:00 2001 From: Devin Date: Tue, 16 Jan 2018 19:36:34 -0500 Subject: [PATCH] Fix typos in songs.h and song_table.inc again, and made the comments match. I'm sorry if I sound like a brolen record. ;) --- include/constants/songs.h | 52 ++++++++++++++++----------------- sound/song_table.inc | 60 +++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/include/constants/songs.h b/include/constants/songs.h index 26ab1da35..58a8e725c 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -16,7 +16,7 @@ #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_BOWA2 15 // Pokémon Withdrawal #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 @@ -43,7 +43,7 @@ #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_BARI 42 // Sootopolis Gym - Walking on Ice #define SE_RU_HYUU 43 // Falling Down #define SE_KI_GASYAN 44 #define SE_TK_WARPIN 45 // Warp In @@ -78,12 +78,12 @@ #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_KABE 77 // Breakable 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_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 @@ -261,7 +261,7 @@ #define SE_RG_KITEKI 256 // S.S. Anne Horn #define SE_RG_HELP_OP 257 // Help Menu Open #define SE_RG_HELP_CL 258 // Help Menu Close -#define SE_RG_HELP_NG 259 // Help Menu Error? +#define SE_RG_HELP_NG 259 // Help Menu Error #define SE_RG_DEOMOV 260 // Deoxys Moves #define SE_RG_EXCELLENT 261 #define SE_RG_NAWAMISS 262 @@ -287,7 +287,7 @@ #define MUS_DOORO_X1 360 // Route 110 #define MUS_DOORO_X3 361 // Route 120 #define MUS_MACHI_S2 362 // Petalburg City -#define MUS_MACHI_S4 363 // Oldale Town +#define MUS_MACHI_S4 363 // Oldale/Lavaridge Town #define MUS_GIM 364 // Gym #define MUS_NAMINORI 365 // Surfing #define MUS_DAN01 366 // Caves and Darkness @@ -297,20 +297,20 @@ #define MUS_FANFA4 370 // Obtained an Item! #define MUS_FANFA5 371 // Your Pokémon Just Evolved! #define MUS_ME_WAZA 372 // Obtained a TM/HM! -#define MUS_BIJYUTU 373 // Lilycove Musseum +#define MUS_BIJYUTU 373 // Lilycove Museum #define MUS_DOORO_X4 374 // Route 122/Intro #define MUS_FUNE_KAN 375 // Slateport Museum #define MUS_ME_SHINKA 376 // Evolution Intro #define MUS_SHINKA 377 // Evolution -#define MUS_ME_WASURE 378 // Move Deleted +#define MUS_ME_WASURE 378 // Move Deleted/Messed Up Appeal #define MUS_SYOUJOEYE 379 // Encounter! Tuber #define MUS_BOYEYE 380 // Encounter! Boy -#define MUS_DAN02 381 // Abandoned Ship -#define MUS_MACHI_S3 382 // Fortree City +#define MUS_DAN02 381 // Abandoned Ship/Southern Island +#define MUS_MACHI_S3 382 // Fortree City/Pacifidlog Town #define MUS_ODAMAKI 383 // Professor Birch's Lab #define MUS_B_TOWER 384 // Battle Tower (RS) #define MUS_SWIMEYE 385 // Encounter! Swimmer -#define MUS_DAN03 386 // Meteor Falls +#define MUS_DAN03 386 // Meteor Falls/Cave of Origin #define MUS_ME_KINOMI 387 // Obtained a Berry! #define MUS_ME_TAMA 388 // Awakening the Super-Ancient Pokémon #define MUS_ME_B_BIG 389 // Slots Jackpot! @@ -321,9 +321,9 @@ #define MUS_TEST2 394 // Contest Test 2 #define MUS_TEST3 395 // Contest Test 3 #define MUS_TEST4 396 // Contest Test 4 -#define MUS_TEST 397 // Encounter! Gentleman (Test?) +#define MUS_TEST 397 // Encounter! Gentleman #define MUS_GOMACHI0 398 // Verdanturf Town -#define MUS_GOTOWN 399 // Rustboro City +#define MUS_GOTOWN 399 // Rustboro/Mauville/Mossdeep City #define MUS_POKECEN 400 // Pokémon Center #define MUS_NEXTROAD 401 // Route 104 #define MUS_GRANROAD 402 // Route 119 @@ -353,24 +353,24 @@ #define MUS_CASINO 426 // Game Corner #define MUS_HIGHTOWN 427 // Dewford Town #define MUS_SAFARI 428 // Safari Zone -#define MUS_C_ROAD 429 // Victory Toad +#define MUS_C_ROAD 429 // Victory Road #define MUS_AJITO 430 // Aqua/Magma Hideout #define MUS_M_BOAT 431 // Sailing #define MUS_M_DUNGON 432 // Mt. Pyre (Inside) #define MUS_FINECITY 433 // Slateport City #define MUS_MACHUPI 434 // Mt. Pyre (Outside) #define MUS_P_SCHOOL 435 // Pokémon Trainer's School -#define MUS_DENDOU 436 // Hall of Fame -#define MUS_TONEKUSA 437 // Lavaridge Town +#define MUS_DENDOU 436 // You're the Champion! +#define MUS_TONEKUSA 437 // Fallarbor Town #define MUS_MABOROSI 438 // Sealed Chamber -#define MUS_CON_FAN 439 // You are the Champion! +#define MUS_CON_FAN 439 // Obtained a Contest Ribbon! #define MUS_CONTEST0 440 // Pokémon Contest #define MUS_MGM0 441 // Encounter! Team Magma #define MUS_T_BATTLE 442 // Opening Battle #define MUS_OOAME 443 // The Flood #define MUS_HIDERI 444 // The Drought #define MUS_RUNECITY 445 // Sootopolis City -#define MUS_CON_K 446 // Berry Blending Results +#define MUS_CON_K 446 // Contest/Berry Blending Results #define MUS_EIKOU_R 447 // Hall of Fame #define MUS_KARAKURI 448 // Trick House #define MUS_HUTAGO 449 // Encounter! Kid @@ -409,7 +409,7 @@ #define MUS_BATTLE38 482 // Battle! Elite Four #define MUS_BATTLE30 483 // Battle! Archie/Maxie // FRLG Music Below -#define MUS_RG_ANNAI 484 // Follow Me +#define MUS_RG_ANNAI 484 // Follow Me! #define MUS_RG_SLOT 485 // Game Corner #define MUS_RG_AJITO 486 // Rocket Hideout #define MUS_RG_GYM 487 // Gym @@ -430,9 +430,9 @@ #define MUS_RG_ENDING 502 // Credits #define MUS_RG_LOAD01 503 // Route 1 #define MUS_RG_OPENING 504 // Route 24/Intro -#define MUS_RG_LOAD02 505 // Route 2 +#define MUS_RG_LOAD02 505 // Route 3 #define MUS_RG_LOAD03 506 // Route 11 -#define MUS_RG_CHAMP_R 507 // Victory Road +#define MUS_RG_CHAMP_R 507 // Victory Road/Indigo Plateau #define MUS_RG_VS_GYM 508 // Battle! Gym Leader/Elite Four #define MUS_RG_VS_TORE 509 // Battle! Trainer #define MUS_RG_VS_YASEI 510 // Battle! Wild Pokémon @@ -445,7 +445,7 @@ #define MUS_RG_NAMINORI 517 // Surfing #define MUS_RG_P_TOWER 518 // Pokémon Tower #define MUS_RG_SHIRUHU 519 // Silph Co. -#define MUS_RG_HANADA 520 // Cerulean City +#define MUS_RG_HANADA 520 // Cerulean/Fuschia City #define MUS_RG_TAMAMUSI 521 // Celadon City #define MUS_RG_WIN_TRE 522 // Victory! Trainer #define MUS_RG_WIN_YASEI 523 // Victory! Wild Pokémon @@ -468,14 +468,14 @@ #define MUS_RG_NETWORK 540 // Network Center #define MUS_RG_OKURIMONO 541 // Mystery Gift #define MUS_RG_KINOMIKUI 542 -#define MUS_RG_NANADUNGEON 543 // Sevii Islands Cave (Mt. Moon) -#define MUS_RG_OSHIE_TV 544 // Follow Me +#define MUS_RG_NANADUNGEON 543 // Sevii Caves/Altering Cave (Mt. Moon) +#define MUS_RG_OSHIE_TV 544 // Follow Me! #define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage) -#define MUS_RG_NANAISEKI 546 // Sevii Islands Forests (Viridian Forest) +#define MUS_RG_NANAISEKI 546 // Sevii Forests (Viridian Forest) #define MUS_RG_NANA123 547 // Sevii Islands 1-3 (Viridian/Saffron/Pewter) #define MUS_RG_NANA45 548 // Sevii Islands 4-5 (Azalea Town) #define MUS_RG_NANA67 549 // Sevii Islands 6-7 (Violet City) -#define MUS_RG_POKEFUE 550 // PokéFlute +#define MUS_RG_POKEFUE 550 // Poké Flute #define MUS_RG_VS_DEO 551 // Battle! Deoxys #define MUS_RG_VS_MYU2 552 // Battle! Mewtwo #define MUS_RG_VS_DEN 553 // Battle! Legendary Birds diff --git a/sound/song_table.inc b/sound/song_table.inc index 04150f381..fd1bda9c5 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -16,7 +16,7 @@ gSongTable:: @ 86B49F0 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_bowa2, 1, 1 @ Pokémon Withdrawal 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 @@ -24,7 +24,7 @@ gSongTable:: @ 86B49F0 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_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 @@ -57,7 +57,7 @@ gSongTable:: @ 86B49F0 song se_moter, 2, 2 song se_card, 1, 1 song se_save, 1, 1 @ Save - song se_kon, 1, 1 @ Poke Ball Bounce 1 + song se_kon, 1, 1 @ Poké 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 @@ -80,14 +80,14 @@ gSongTable:: @ 86B49F0 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_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_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_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_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 @@ -261,7 +261,7 @@ gSongTable:: @ 86B49F0 song se_rg_kiteki, 1, 1 @ S.S. Anne Horn song se_rg_help_op, 1, 1 @ Help Menu Open song se_rg_help_cl, 1, 1 @ Help Menu Close - song se_rg_help_ng, 1, 1 @ Help Menu Error? + song se_rg_help_ng, 1, 1 @ Help Menu Error song se_rg_deomov, 1, 1 @ Deoxys Moves song se_rg_excellent, 1, 1 song se_rg_nawamiss, 1, 1 @@ -367,7 +367,7 @@ gSongTable:: @ 86B49F0 song mus_dooro_x1, 0, 0 @ Route 110 song mus_dooro_x3, 0, 0 @ Route 120 song mus_machi_s2, 0, 0 @ Petalburg City - song mus_machi_s4, 0, 0 @ Oldale Town + song mus_machi_s4, 0, 0 @ Oldale/Lavaridge Town song mus_gim, 0, 0 @ Gym song mus_naminori, 0, 0 @ Surfing song mus_dan01, 0, 0 @ Caves and Darkness @@ -382,15 +382,15 @@ gSongTable:: @ 86B49F0 song mus_fune_kan, 0, 0 @ Slateport Museum song mus_me_shinka, 2, 2 @ Evolution Intro song mus_shinka, 0, 0 @ Evolution - song mus_me_wasure, 2, 2 @ Move Deleted + song mus_me_wasure, 2, 2 @ Move Deleted/Messed Up Appeal song mus_syoujoeye, 0, 0 @ Encounter! Tuber song mus_boyeye, 0, 0 @ Encounter! Boy - song mus_dan02, 0, 0 @ Abandoned Ship - song mus_machi_s3, 0, 0 @ Fortree City + song mus_dan02, 0, 0 @ Abandoned Ship/Southern Island + song mus_machi_s3, 0, 0 @ Fortree City/Pacifidlog Town song mus_odamaki, 0, 0 @ Professor Birch's Lab song mus_b_tower, 0, 0 @ Battle Tower (RS) song mus_swimeye, 0, 0 @ Encounter! Swimmer - song mus_dan03, 0, 0 @ Meteor Falls + song mus_dan03, 0, 0 @ Meteor Falls/Cave of Origin song mus_me_kinomi, 2, 2 @ Obtained a Berry! song mus_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon song mus_me_b_big, 2, 2 @ Slots Jackpot! @@ -401,9 +401,9 @@ gSongTable:: @ 86B49F0 song mus_test2, 0, 0 @ Contest Test 2 song mus_test3, 0, 0 @ Contest Test 3 song mus_test4, 0, 0 @ Contest Test 4 - song mus_test, 0, 0 @ Encounter! Gentleman (Test?) + song mus_test, 0, 0 @ Encounter! Gentleman song mus_gomachi0, 0, 0 @ Verdanturf Town - song mus_gotown, 0, 0 @ Rustboro City + song mus_gotown, 0, 0 @ Rustboro/Mauville/Mossdeep City song mus_pokecen, 0, 0 @ Pokémon Center song mus_nextroad, 0, 0 @ Route 104 song mus_granroad, 0, 0 @ Route 119 @@ -438,19 +438,19 @@ gSongTable:: @ 86B49F0 song mus_m_boat, 0, 0 @ Sailing song mus_m_dungon, 0, 0 @ Mt. Pyre (Inside) song mus_finecity, 0, 0 @ Slateport City - song mus_machupi, 0, 0 @ Mt. Pyte (Outside) + song mus_machupi, 0, 0 @ Mt. Pyre (Outside) song mus_p_school, 0, 0 @ Pokémon Trainer's School - song mus_dendou, 0, 0 @ Hall of Fame - song mus_tonekusa, 0, 0 @ Lavaridge Town + song mus_dendou, 0, 0 @ You're the Champion! + song mus_tonekusa, 0, 0 @ Fallarbor Town song mus_maborosi, 0, 0 @ Sealed Chamber - song mus_con_fan, 0, 0 @ You are the Champion! + song mus_con_fan, 0, 0 @ Obtained a Contest Ribbon! song mus_contest0, 0, 0 @ Pokémon Contest song mus_mgm0, 0, 0 @ Encounter! Team Magma song mus_t_battle, 0, 0 @ Opening Battle song mus_ooame, 0, 0 @ The Flood song mus_hideri, 0, 0 @ The Drought song mus_runecity, 0, 0 @ Sootopolis City - song mus_con_k, 0, 0 @ Berry Blending Results + song mus_con_k, 0, 0 @ Contest/Berry Blending Results song mus_eikou_r, 0, 0 @ Hall of Fame song mus_karakuri, 0, 0 @ Trick House song mus_hutago, 0, 0 @ Encounter! Kid @@ -488,8 +488,8 @@ gSongTable:: @ 86B49F0 song mus_battle35, 0, 0 @ Battle! Rival song mus_battle38, 0, 0 @ Battle! Elite Four song mus_battle30, 0, 0 @ Battle! Archie/Maxie - @ FRLG Music below - song mus_rg_annai, 0, 0 @ Follow Me + @ FRLG Music Below + song mus_rg_annai, 0, 0 @ Follow Me! song mus_rg_slot, 0, 0 @ Game Corner song mus_rg_ajito, 0, 0 @ Rocket Hideout song mus_rg_gym, 0, 0 @ Gym @@ -503,16 +503,16 @@ gSongTable:: @ 86B49F0 song mus_rg_rocket, 0, 0 @ Encounter! Team Rocket song mus_rg_shoujo, 0, 0 @ Encounter! Girl song mus_rg_shounen, 0, 0 @ Encounter! Boy - song mus_rg_dendou, 0, 0 @ You're the Champion + song mus_rg_dendou, 0, 0 @ You're the Champion! song mus_rg_t_mori, 0, 0 @ Viridian Forest song mus_rg_otsukimi, 0, 0 @ Mt. Moon song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion song mus_rg_ending, 0, 0 @ Credits song mus_rg_load01, 0, 0 @ Route 1 song mus_rg_opening, 0, 0 @ Route 24/Intro - song mus_rg_load02, 0, 0 @ Route 2 + song mus_rg_load02, 0, 0 @ Route 3 song mus_rg_load03, 0, 0 @ Route 11 - song mus_rg_champ_r, 0, 0 @ Victory Road + song mus_rg_champ_r, 0, 0 @ Victory Road/Indigo Plateau song mus_rg_vs_gym, 0, 0 @ Battle! Gym Leader/Elite Four song mus_rg_vs_tore, 0, 0 @ Battle! Trainer song mus_rg_vs_yasei, 0, 0 @ Battle! Wild Pokémon @@ -525,7 +525,7 @@ gSongTable:: @ 86B49F0 song mus_rg_naminori, 0, 0 @ Surfing song mus_rg_p_tower, 0, 0 @ Pokémon Tower song mus_rg_shiruhu, 0, 0 @ Silph Co. - song mus_rg_hanada, 0, 0 @ Cerulean City + song mus_rg_hanada, 0, 0 @ Cerulean/Fuschia City song mus_rg_tamamusi, 0, 0 @ Celadon City song mus_rg_win_tre, 0, 0 @ Victory! Trainer song mus_rg_win_yasei, 0, 0 @ Victory! Wild Pokémon @@ -540,7 +540,7 @@ gSongTable:: @ 86B49F0 song mus_me_rg_photo, 2, 2 @ Trainer Photo song mus_rg_titlerog, 0, 0 @ Game Freak song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme - song mus_rg_sousa, 0, 0 @ Starting Tutorial + song mus_rg_sousa, 0, 0 @ Starting Tutorial song mus_rg_sekaikan, 0, 0 @ Starting Tutorial 2 song mus_rg_seibetu, 0, 0 @ Starting Tutorial 3 song mus_rg_jump, 0, 0 @ Jumping Minigame @@ -548,10 +548,10 @@ gSongTable:: @ 86B49F0 song mus_rg_network, 0, 0 @ Network Center song mus_rg_okurimono, 0, 0 @ Mystery Gift song mus_rg_kinomikui, 0, 0 - song mus_rg_nanadungeon, 0, 0 @ Sevii Islands Cave (Mt. Moon) + song mus_rg_nanadungeon, 0, 0 @ Sevii Caves/Altering Cave (Mt. Moon) song mus_rg_oshie_tv, 0, 0 @ Follow Me! song mus_rg_nanashima, 0, 0 @ Sevii Islands Routes (Lake of Rage) - song mus_rg_nanaiseki, 0, 0 @ Sevii Islands Forest (Viridian Forest) + song mus_rg_nanaiseki, 0, 0 @ Sevii Forests (Viridian Forest) song mus_rg_nana123, 0, 0 @ Sevii Islands 1-3 (Viridian/Saffron/Pewter) song mus_rg_nana45, 0, 0 @ Sevii Islands 4-5 (Azalea Town) song mus_rg_nana67, 0, 0 @ Sevii Islands 6-7 (Violet City) @@ -560,7 +560,7 @@ gSongTable:: @ 86B49F0 song mus_rg_vs_myu2, 0, 0 @ Battle! Mewtwo song mus_rg_vs_den, 0, 0 @ Battle! Legendary Birds song mus_rg_exeye, 0, 0 @ Encounter! Gym Leader - song mus_rg_deoeye, 0, 0 @ Encounter! Deoxys! + song mus_rg_deoeye, 0, 0 @ Encounter! Deoxys song mus_rg_t_tower, 0, 0 @ Trainer Tower (Gym) song mus_rg_slowmasara, 0, 0 @ Pallet Town (Hall of Fame remix) song mus_rg_tvnoize, 0, 0 @ Teachy TV