diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-09 20:02:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-09 20:02:59 -0400 |
| commit | 855c052be041ed85789db1e460dd35cab9d12b4f (patch) | |
| tree | 35dcf54a3b48510c01c721e2733646ed597ff79a | |
| parent | 734cada66a2d9938cdc9a2806f68352d06da6e9a (diff) | |
Rename song constants using Japanese sound test menu
530 files changed, 1293 insertions, 1405 deletions
diff --git a/asm/bike.s b/asm/bike.s index 94583aa47..4d2683968 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -738,8 +738,8 @@ _080BD5F4: .4byte gPlayerAvatar _080BD5F8: adds r0, r2, 0 bl SetPlayerAvatarTransitionFlags - movs r4, 0x8D @ BGM_FRLG_BICYCLE - lsls r4, 1 @ BGM_FRLG_BICYCLE + movs r4, 0x8D @ MUS_CYCLING + lsls r4, 1 @ MUS_CYCLING adds r0, r4, 0 bl sub_8056124 cmp r0, 0 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index ce675d88e..fbb7cdc9c 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -138,7 +138,7 @@ _080F1EC4: bne _080F1EF0 ldr r0, _080F1EEC @ =sub_80F1DC0 bl SetMainCallback2 - movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1 + movs r0, 0x8F @ MUS_DENDOU >> 1 lsls r0, 1 bl PlayBGM movs r0, 0 diff --git a/asm/overworld.s b/asm/overworld.s index ec8a03ddd..81651a0ad 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2441,7 +2441,7 @@ _08055E40: lsls r0, 24 cmp r0, 0 beq _08055E5A - ldr r5, _08055E74 @ =0x00000131 @ BGM_FRLG_SURF + ldr r5, _08055E74 @ =0x00000131 @ MUS_NAMINORI adds r0, r5, 0 bl sub_8056124 cmp r0, 0 @@ -2511,7 +2511,7 @@ _08055EA8: bl GetCurrentMapMusic lsls r0, 16 lsrs r6, r0, 16 - ldr r5, _08055F08 @ =0x00000131 @ BGM_FRLG_SURF + ldr r5, _08055F08 @ =0x00000131 @ MUS_NAMINORI cmp r6, r5 beq _08055F14 movs r0, 0x8 diff --git a/charmap.txt b/charmap.txt index fe0747616..a191b9b7b 100644 --- a/charmap.txt +++ b/charmap.txt @@ -449,334 +449,354 @@ WHITE2 = 0F @ duplicate of white? @ sound and music -SE_STOP = 00 00 -SE_KAIFUKU = 01 00 -SE_PC_LOGON = 02 00 -SE_PC_OFF = 03 00 -SE_PC_ON = 04 00 -SE_SELECT = 05 00 -SE_WIN_OPEN = 06 00 -SE_WALL_HIT = 07 00 -SE_DOOR = 08 00 -SE_KAIDAN = 09 00 -SE_DANSA = 0A 00 -SE_JITENSYA = 0B 00 -SE_KOUKA_L = 0C 00 -SE_KOUKA_M = 0D 00 -SE_KOUKA_H = 0E 00 -SE_BOWA2 = 0F 00 -SE_POKE_DEAD = 10 00 -SE_NIGERU = 11 00 -SE_JIDO_DOA = 12 00 -SE_NAMINORI = 13 00 -SE_BAN = 14 00 -SE_PIN = 15 00 -SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 -SE_A = 19 00 -SE_I = 1A 00 -SE_U = 1B 00 -SE_E = 1C 00 -SE_O = 1D 00 -SE_N = 1E 00 -SE_SEIKAI = 1F 00 -SE_HAZURE = 20 00 -SE_EXP = 21 00 -SE_JITE_PYOKO = 22 00 -SE_MU_PACHI = 23 00 -SE_TK_KASYA = 24 00 -SE_FU_ZAKU = 25 00 -SE_FU_ZAKU2 = 26 00 -SE_FU_ZUZUZU = 27 00 -SE_RU_GASHIN = 28 00 -SE_RU_GASYAN = 29 00 -SE_RU_BARI = 2A 00 -SE_RU_HYUU = 2B 00 -SE_KI_GASYAN = 2C 00 -SE_TK_WARPIN = 2D 00 -SE_TK_WARPOUT = 2E 00 -SE_TU_SAA = 2F 00 -SE_HI_TURUN = 30 00 -SE_TRACK_MOVE = 31 00 -SE_TRACK_STOP = 32 00 -SE_TRACK_HAIK = 33 00 -SE_TRACK_DOOR = 34 00 -SE_MOTER = 35 00 -SE_CARD = 36 00 -SE_SAVE = 37 00 -SE_KON = 38 00 -SE_KON2 = 39 00 -SE_KON3 = 3A 00 -SE_KON4 = 3B 00 -SE_SUIKOMU = 3C 00 -SE_NAGERU = 3D 00 -SE_TOY_C = 3E 00 -SE_TOY_D = 3F 00 -SE_TOY_E = 40 00 -SE_TOY_F = 41 00 -SE_TOY_G = 42 00 -SE_TOY_A = 43 00 -SE_TOY_B = 44 00 -SE_TOY_C1 = 45 00 -SE_MIZU = 46 00 -SE_HASHI = 47 00 -SE_DAUGI = 48 00 -SE_PINPON = 49 00 -SE_FUUSEN1 = 4A 00 -SE_FUUSEN2 = 4B 00 -SE_FUUSEN3 = 4C 00 -SE_TOY_KABE = 4D 00 -SE_TOY_DANGO = 4E 00 -SE_DOKU = 4F 00 -SE_ESUKA = 50 00 -SE_T_AME = 51 00 -SE_T_AME_E = 52 00 -SE_T_OOAME = 53 00 -SE_T_OOAME_E = 54 00 -SE_T_KOAME = 55 00 -SE_T_KOAME_E = 56 00 -SE_T_KAMI = 57 00 -SE_T_KAMI2 = 58 00 -SE_ELEBETA = 59 00 -SE_HINSI = 5A 00 -SE_EXPMAX = 5B 00 -SE_TAMAKORO = 5C 00 -SE_TAMAKORO_E = 5D 00 -SE_BASABASA = 5E 00 -SE_REGI = 5F 00 -SE_C_GAJI = 60 00 -SE_C_MAKU_U = 61 00 -SE_C_MAKU_D = 62 00 -SE_C_PASI = 63 00 -SE_C_SYU = 64 00 -SE_C_PIKON = 65 00 -SE_REAPOKE = 66 00 -SE_OP_BASYU = 67 00 -SE_BT_START = 68 00 -SE_DENDOU = 69 00 -SE_JIHANKI = 6A 00 -SE_TAMA = 6B 00 -SE_Z_SCROLL = 6C 00 -SE_Z_PAGE = 6D 00 -SE_PN_ON = 6E 00 -SE_PN_OFF = 6F 00 -SE_Z_SEARCH = 70 00 -SE_TAMAGO = 71 00 -SE_TB_START = 72 00 -SE_TB_KON = 73 00 -SE_TB_KARA = 74 00 -SE_BIDORO = 75 00 - -MUS_ME_ASA = 00 01 -MUS_FANFA1 = 01 01 -MUS_FANFA4 = 02 01 -MUS_FANFA5 = 03 01 -MUS_ME_BACHI = 04 01 -MUS_ME_WAZA = 05 01 -MUS_ME_KINOMI = 06 01 -MUS_ME_SHINKA = 07 01 -BGM_FRLG_SAFARI_ZONE = 08 01 -MUS_SHINKA = 08 01 -BGM_FRLG_CHANSEY_DANCE = 0B 01 -MUS_ME_B_BIG = 0C 01 -MUS_ME_B_SMALL = 0D 01 -MUS_ME_WASURE = 0E 01 -MUS_ME_ZANNEN = 0F 01 -BGM_FRLG_FOLLOW_ME = 10 01 -BGM_FRLG_GAMECORNER = 11 01 -BGM_FRLG_ROCKET_HIDEOUT = 12 01 -BGM_FRLG_GYM = 13 01 -BGM_FRLG_JIGGLYPUFF = 14 01 -BGM_FRLG_OPENING = 15 01 -BGM_FRLG_TITLE = 16 01 -BGM_FRLG_CINNABAR_ISLAND = 17 01 -BGM_FRLG_LAVENDER_TOWN = 18 01 -BGM_FRLG_HEALING_TEST = 19 01 -BGM_FRLG_BICYCLE = 1A 01 -BGM_FRLG_SUSPICIOUS_EYE = 1B 01 -BGM_FRLG_GIRL_EYE = 1C 01 -BGM_FRLG_BOY_EYE = 1D 01 -BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME = 1E 01 -BGM_FRLG_VIRIDIAN_FOREST = 1F 01 -BGM_FRLG_MT_MOON = 20 01 -BGM_FRLG_POKEMON_MANSION = 21 01 -BGM_FRLG_CREDITS = 22 01 -BGM_FRLG_ROUTE_1 = 23 01 -BGM_FRLG_ROUTE_24 = 24 01 -BGM_FRLG_ROUTE_3 = 25 01 -BGM_FRLG_ROUTE_11 = 26 01 -BGM_FRLG_INDIGO_PLATEAU = 27 01 -BGM_FRLG_BATTLE_LEADER = 28 01 -BGM_FRLG_BATTLE_TRAINER = 29 01 -BGM_FRLG_BATTLE_WILD_POKEMON = 2A 01 -BGM_FRLG_BATTLE_CHAMPION = 2B 01 -BGM_FRLG_PALLET_TOWN = 2C 01 -BGM_FRLG_OAK_LAB = 2D 01 -BGM_FRLG_PROF_OAK = 2E 01 -BGM_FRLG_POKEMON_CENTER = 2F 01 -BGM_FRLG_SS_ANNE = 30 01 -BGM_FRLG_SURF = 31 01 -BGM_FRLG_POKEMON_TOWER = 32 01 -BGM_FRLG_SILPH = 33 01 -BGM_FRLG_CERULEAN_CITY = 34 01 -BGM_FRLG_CELADON_CITY = 35 01 -BGM_FRLG_KACHI_TRAINER = 36 01 -BGM_FRLG_KACHI_WILD_POKEMON = 37 01 -BGM_FRLG_KACHI_LEADER = 38 01 -BGM_FRLG_VERMILION_CITY = 39 01 -BGM_FRLG_VIRIDIAN_CITY = 3A 01 -BGM_FRLG_RIVAL = 3B 01 -BGM_FRLG_RIVAL_POSTBATTLE = 3C 01 -BGM_FRLG_ME_POKEDEX_EVAL = 3D 01 -BGM_FRLG_ME_KEYITEM = 3E 01 -BGM_FRLG_FANFA_POKEMON_CAUGHT = 3F 01 -BGM_FRLG_FANFA_TRAINERCARD_PHOTO = 40 01 -BGM_FRLG_GAMEFREAK_LOGO = 41 01 -BGM_FRLG_CAUGHT_POKEMON = 42 01 -BGM_FRLG_GAME_EXPLANATION_START = 43 01 -BGM_FRLG_GAME_EXPLANATION_MIDDLE = 44 01 -BGM_FRLG_GAME_EXPLANATION_END = 45 01 -BGM_FRLG_POKEMON_JUMP = 46 01 -BGM_FRLG_UNION_ROOM = 47 01 -BGM_FRLG_POKEMON_NETWORK_CENTER = 48 01 -BGM_FRLG_MYSTERY_GIFT = 49 01 -BGM_FRLG_DODRIO_BERRY_PICK = 4A 01 -BGM_FRLG_MT_EMBER = 4B 01 -BGM_FRLG_TEACHY_TV_EPISODE = 4C 01 -BGM_FRLG_SEVII_ISLANDS = 4D 01 -BGM_FRLG_TANOBY_RUINS = 4E 01 -BGM_FRLG_ISLAND_ONE = 4F 01 -BGM_FRLG_ISLAND_FOUR = 50 01 -BGM_FRLG_ISLAND_SIX = 51 01 -BGM_FRLG_FLUTE = 52 01 -BGM_FRLG_BATTLE_DEOXYS = 53 01 -BGM_FRLG_BATTLE_MEWTWO = 54 01 -BGM_FRLG_BATTLE_LEGENDARY = 55 01 -BGM_FRLG_LEADER_EYE = 56 01 -BGM_FRLG_DEOXYS_EYE = 57 01 -BGM_FRLG_TRAINER_TOWER = 58 01 -BGM_FRLG_HALL_OF_FAME_PALLET_TOWN = 59 01 -BGM_FRLG_TEACHY_TV = 5A 01 - -BGM_STOP = 5D 01 -BGM_TETSUJI = 5E 01 -BGM_FIELD13 = 5F 01 -BGM_KACHI22 = 60 01 -BGM_KACHI2 = 61 01 -BGM_KACHI3 = 62 01 -BGM_KACHI5 = 63 01 -BGM_PCC = 64 01 -BGM_NIBI = 65 01 -BGM_SUIKUN = 66 01 -BGM_DOORO1 = 67 01 -BGM_DOORO_X1 = 68 01 -BGM_DOORO_X3 = 69 01 -BGM_MACHI_S2 = 6A 01 -BGM_MACHI_S4 = 6B 01 -BGM_GIM = 6C 01 -BGM_NAMINORI = 6D 01 -BGM_DAN01 = 6E 01 -BGM_FANFA1 = 6F 01 -BGM_ME_ASA = 70 01 -BGM_ME_BACHI = 71 01 -BGM_FANFA4 = 72 01 -BGM_FANFA5 = 73 01 -BGM_ME_WAZA = 74 01 -BGM_BIJYUTU = 75 01 -BGM_DOORO_X4 = 76 01 -BGM_FUNE_KAN = 77 01 -BGM_ME_SHINKA = 78 01 -BGM_SHINKA = 79 01 -BGM_ME_WASURE = 7A 01 -BGM_SYOUJOEYE = 7B 01 -BGM_BOYEYE = 7C 01 -BGM_DAN02 = 7D 01 -BGM_MACHI_S3 = 7E 01 -BGM_ODAMAKI = 7F 01 -BGM_B_TOWER = 80 01 -BGM_SWIMEYE = 81 01 -BGM_DAN03 = 82 01 -BGM_ME_KINOMI = 83 01 -BGM_ME_TAMA = 84 01 -BGM_ME_B_BIG = 85 01 -BGM_ME_B_SMALL = 86 01 -BGM_ME_ZANNEN = 87 01 -BGM_BD_TIME = 88 01 -BGM_TEST1 = 89 01 -BGM_TEST2 = 8A 01 -BGM_TEST3 = 8B 01 -BGM_TEST4 = 8C 01 -BGM_TEST = 8D 01 -BGM_GOMACHI0 = 8E 01 -BGM_GOTOWN = 8F 01 -BGM_POKECEN = 90 01 -BGM_NEXTROAD = 91 01 -BGM_GRANROAD = 92 01 -BGM_CYCLING = 93 01 -BGM_FRIENDLY = 94 01 -BGM_MISHIRO = 95 01 -BGM_TOZAN = 96 01 -BGM_GIRLEYE = 97 01 -BGM_MINAMO = 98 01 -BGM_ASHROAD = 99 01 -BGM_EVENT0 = 9A 01 -BGM_DEEPDEEP = 9B 01 -BGM_KACHI1 = 9C 01 -BGM_TITLE3 = 9D 01 -BGM_DEMO1 = 9E 01 -BGM_GIRL_SUP = 9F 01 -BGM_HAGESHII = A0 01 -BGM_KAKKOII = A1 01 -BGM_KAZANBAI = A2 01 -BGM_AQA_0 = A3 01 -BGM_TSURETEK = A4 01 -BGM_BOY_SUP = A5 01 -BGM_RAINBOW = A6 01 -BGM_AYASII = A7 01 -BGM_KACHI4 = A8 01 -BGM_ROPEWAY = A9 01 -BGM_CASINO = AA 01 -BGM_HIGHTOWN = AB 01 -BGM_SAFARI = AC 01 -BGM_C_ROAD = AD 01 -BGM_AJITO = AE 01 -BGM_M_BOAT = AF 01 -BGM_M_DUNGON = B0 01 -BGM_FINECITY = B1 01 -BGM_MACHUPI = B2 01 -BGM_P_SCHOOL = B3 01 -BGM_DENDOU = B4 01 -BGM_TONEKUSA = B5 01 -BGM_MABOROSI = B6 01 -BGM_CON_FAN = B7 01 -BGM_CONTEST0 = B8 01 -BGM_MGM0 = B9 01 -BGM_T_BATTLE = BA 01 -BGM_OOAME = BB 01 -BGM_HIDERI = BC 01 -BGM_RUNECITY = BD 01 -BGM_CON_K = BE 01 -BGM_EIKOU_R = BF 01 -BGM_KARAKURI = C0 01 -BGM_HUTAGO = C1 01 -BGM_SITENNOU = C2 01 -BGM_YAMA_EYE = C3 01 -BGM_CONLOBBY = C4 01 -BGM_INTER_V = C5 01 -BGM_DAIGO = C6 01 -BGM_THANKFOR = C7 01 -BGM_END = C8 01 -BGM_BATTLE27 = C9 01 -BGM_BATTLE31 = CA 01 -BGM_BATTLE20 = CB 01 -BGM_BATTLE32 = CC 01 -BGM_BATTLE33 = CD 01 -BGM_BATTLE36 = CE 01 -BGM_BATTLE34 = CF 01 -BGM_BATTLE35 = D0 01 -BGM_BATTLE38 = D1 01 -BGM_BATTLE30 = D2 01 +MUS_DUMMY = 00 00 +SE_STOP = 00 00 +SE_KAIFUKU = 01 00 +SE_PC_LOGIN = 02 00 +SE_PC_OFF = 03 00 +SE_PC_ON = 04 00 +SE_SELECT = 05 00 +SE_WIN_OPEN = 06 00 +SE_WALL_HIT = 07 00 +SE_DOOR = 08 00 +SE_KAIDAN = 09 00 +SE_DANSA = 0A 00 +SE_JITENSYA = 0B 00 +SE_KOUKA_L = 0C 00 +SE_KOUKA_M = 0D 00 +SE_KOUKA_H = 0E 00 +SE_BOWA2 = 0F 00 +SE_POKE_DEAD = 10 00 +SE_NIGERU = 11 00 +SE_JIDO_DOA = 12 00 +SE_NAMINORI = 13 00 +SE_BAN = 14 00 +SE_PIN = 15 00 +SE_BOO = 16 00 +SE_BOWA = 17 00 +SE_JYUNI = 18 00 +SE_SEIKAI = 19 00 +SE_HAZURE = 1A 00 +SE_EXP = 1B 00 +SE_JITE_PYOKO = 1C 00 +SE_MU_PACHI = 1D 00 +SE_TK_KASYA = 1E 00 +SE_FU_ZAKU = 1F 00 +SE_FU_ZAKU2 = 20 00 +SE_FU_ZUZUZU = 21 00 +SE_RU_GASHIN = 22 00 +SE_RU_GASYAN = 23 00 +SE_RU_BARI = 24 00 +SE_RU_HYUU = 25 00 +SE_KI_GASYAN = 26 00 +SE_TK_WARPIN = 27 00 +SE_TK_WARPOUT = 28 00 +SE_TU_SAA = 29 00 +SE_HI_TURUN = 2A 00 +SE_TRACK_MOVE = 2B 00 +SE_TRACK_STOP = 2C 00 +SE_TRACK_HAIKI = 2D 00 +SE_TRACK_DOOR = 2E 00 +SE_MOTER = 2F 00 +SE_SAVE = 30 00 +SE_KON = 31 00 +SE_KON2 = 32 00 +SE_KON3 = 33 00 +SE_KON4 = 34 00 +SE_SUIKOMU = 35 00 +SE_NAGERU = 36 00 +SE_TOY_C = 37 00 +SE_TOY_D = 38 00 +SE_TOY_E = 39 00 +SE_TOY_F = 3A 00 +SE_TOY_G = 3B 00 +SE_TOY_A = 3C 00 +SE_TOY_B = 3D 00 +SE_TOY_C1 = 3E 00 +SE_MIZU = 3F 00 +SE_HASHI = 40 00 +SE_DAUGI = 41 00 +SE_PINPON = 42 00 +SE_FUUSEN1 = 43 00 +SE_FUUSEN2 = 44 00 +SE_FUUSEN3 = 45 00 +SE_TOY_KABE = 46 00 +SE_TOY_DANGO = 47 00 +SE_DOKU = 48 00 +SE_ESUKA = 49 00 +SE_T_AME = 4A 00 +SE_T_AME_E = 4B 00 +SE_T_OOAME = 4C 00 +SE_T_OOAME_E = 4D 00 +SE_T_KOAME = 4E 00 +SE_T_KOAME_E = 4F 00 +SE_T_KAMI = 50 00 +SE_T_KAMI2 = 51 00 +SE_ELEBETA = 52 00 +SE_HINSI = 53 00 +SE_EXPMAX = 54 00 +SE_TAMAKORO = 55 00 +SE_TAMAKORO_E = 56 00 +SE_BASABASA = 57 00 +SE_REGI = 58 00 +SE_C_GAJI = 59 00 +SE_C_MAKU_U = 5A 00 +SE_C_MAKU_D = 5B 00 +SE_C_PASI = 5C 00 +SE_C_SYU = 5D 00 +SE_C_PIKON = 5E 00 +SE_REAPOKE = 5F 00 +SE_OP_BASYU = 60 00 +SE_BT_START = 61 00 +SE_DENDOU = 62 00 +SE_JIHANKI = 63 00 +SE_TAMA = 64 00 +SE_Z_SCROLL = 65 00 +SE_Z_PAGE = 66 00 +SE_PN_ON = 67 00 +SE_PN_OFF = 68 00 +SE_Z_SEARCH = 69 00 +SE_TAMAGO = 6A 00 +SE_TB_START = 6B 00 +SE_TB_KON = 6C 00 +SE_TB_KARA = 6D 00 +SE_BIDORO = 6E 00 +SE_W085 = 6F 00 +SE_W085B = 70 00 +SE_W231 = 71 00 +SE_W171 = 72 00 +SE_W233 = 73 00 +SE_W233B = 74 00 +SE_W145 = 75 00 +SE_W145B = 76 00 +SE_W145C = 77 00 +SE_W240 = 78 00 +SE_W015 = 79 00 +SE_W081 = 7A 00 +SE_W081B = 7B 00 +SE_W088 = 7C 00 +SE_W016 = 7D 00 +SE_W016B = 7E 00 +SE_W003 = 7F 00 +SE_W104 = 80 00 +SE_W013 = 81 00 +SE_W196 = 82 00 +SE_W086 = 83 00 +SE_W004 = 84 00 +SE_W025 = 85 00 +SE_W025B = 86 00 +SE_W152 = 87 00 +SE_W026 = 88 00 +SE_W172 = 89 00 +SE_W172B = 8A 00 +SE_W053 = 8B 00 +SE_W007 = 8C 00 +SE_W092 = 8D 00 +SE_W221 = 8E 00 +SE_W221B = 8F 00 +SE_W052 = 90 00 +SE_W036 = 91 00 +SE_W059 = 92 00 +SE_W059B = 93 00 +SE_W010 = 94 00 +SE_W011 = 95 00 +SE_W017 = 96 00 +SE_W019 = 97 00 +SE_W028 = 98 00 +SE_W013B = 99 00 +SE_W044 = 9A 00 +SE_W029 = 9B 00 +SE_W057 = 9C 00 +SE_W056 = 9D 00 +SE_W250 = 9E 00 +SE_W030 = 9F 00 +SE_W039 = A0 00 +SE_W054 = A1 00 +SE_W077 = A2 00 +SE_W020 = A3 00 +SE_W082 = A4 00 +SE_W047 = A5 00 +SE_W195 = A6 00 +SE_W006 = A7 00 +SE_W091 = A8 00 +SE_W146 = A9 00 +SE_W120 = AA 00 +SE_W153 = AB 00 +SE_W071B = AC 00 +SE_W071 = AD 00 +SE_W103 = AE 00 +SE_W062 = AF 00 +SE_W062B = B0 00 +SE_W048 = B1 00 +SE_W187 = B2 00 +SE_W118 = B3 00 +SE_W155 = B4 00 +SE_W122 = B5 00 +SE_W060 = B6 00 +SE_W185 = B7 00 +SE_W014 = B8 00 +SE_W043 = B9 00 +SE_W207 = BA 00 +SE_W207B = BB 00 +SE_W215 = BC 00 +SE_W109 = BD 00 +SE_W173 = BE 00 +SE_W280 = BF 00 +SE_W202 = C0 00 +SE_W060B = C1 00 +SE_W076 = C2 00 +SE_W080 = C3 00 +SE_W100 = C4 00 +SE_W107 = C5 00 +SE_W166 = C6 00 +SE_W129 = C7 00 +SE_W115 = C8 00 +SE_W112 = C9 00 +SE_W197 = CA 00 +SE_W199 = CB 00 +SE_W236 = CC 00 +SE_W204 = CD 00 +SE_W268 = CE 00 +SE_W070 = CF 00 +SE_W063 = D0 00 +SE_W127 = D1 00 +SE_W179 = D2 00 +SE_W151 = D3 00 +SE_W201 = D4 00 +SE_W161 = D5 00 +SE_W161B = D6 00 +SE_W227 = D7 00 +SE_W227B = D8 00 +SE_W226 = D9 00 +SE_W208 = DA 00 +SE_W213 = DB 00 +SE_W213B = DC 00 +SE_W234 = DD 00 +SE_W260 = DE 00 +SE_W328 = DF 00 +SE_W320 = E0 00 +SE_W255 = E1 00 +SE_W291 = E2 00 +SE_W089 = E3 00 +SE_W239 = E4 00 +SE_W230 = E5 00 +SE_W281 = E6 00 +SE_W327 = E7 00 +SE_W287 = E8 00 +SE_W257 = E9 00 +SE_W253 = EA 00 +SE_W258 = EB 00 +SE_W322 = EC 00 +SE_W298 = ED 00 +SE_W287B = EE 00 +SE_W114 = EF 00 +SE_W063B = F0 00 +MUS_W_DOOR = F1 00 +SE_CARD1 = F2 00 +SE_CARD2 = F3 00 +SE_CARD3 = F4 00 +SE_BAG1 = F5 00 +SE_BAG2 = F6 00 +SE_GETTING = F7 00 +SE_SHOP = F8 00 +SE_KITEKI = F9 00 +SE_HELP_OP = FA 00 +SE_HELP_CL = FB 00 +SE_HELP_NG = FC 00 +SE_DEOMOV = FD 00 +SE_EXCELLENT = FE 00 +SE_NAWAMISS = FF 00 +MUS_ME_ASA = 00 01 +MUS_FANFA1 = 01 01 +MUS_FANFA4 = 02 01 +MUS_FANFA5 = 03 01 +MUS_ME_BACHI = 04 01 +MUS_ME_WAZA = 05 01 +MUS_ME_KINOMI = 06 01 +MUS_ME_SHINKA = 07 01 +MUS_SHINKA = 08 01 +MUS_BATTLE32 = 09 01 +MUS_BATTLE20 = 0A 01 +MUS_P_SCHOOL = 0B 01 +MUS_ME_B_BIG = 0C 01 +MUS_ME_B_SMALL = 0D 01 +MUS_ME_WASURE = 0E 01 +MUS_ME_ZANNEN = 0F 01 +MUS_ANNAI = 10 01 +MUS_SLOT = 11 01 +MUS_AJITO = 12 01 +MUS_GYM = 13 01 +MUS_PURIN = 14 01 +MUS_DEMO = 15 01 +MUS_TITLE = 16 01 +MUS_GUREN = 17 01 +MUS_SHION = 18 01 +MUS_KAIHUKU = 19 01 +MUS_CYCLING = 1A 01 +MUS_ROCKET = 1B 01 +MUS_SHOUJO = 1C 01 +MUS_SHOUNEN = 1D 01 +MUS_DENDOU = 1E 01 +MUS_T_MORI = 1F 01 +MUS_OTSUKIMI = 20 01 +MUS_POKEYASHI = 21 01 +MUS_ENDING = 22 01 +MUS_LOAD01 = 23 01 +MUS_OPENING = 24 01 +MUS_LOAD02 = 25 01 +MUS_LOAD03 = 26 01 +MUS_CHAMP_R = 27 01 +MUS_VS_GYM = 28 01 +MUS_VS_TORE = 29 01 +MUS_VS_YASEI = 2A 01 +MUS_VS_LAST = 2B 01 +MUS_MASARA = 2C 01 +MUS_KENKYU = 2D 01 +MUS_OHKIDO = 2E 01 +MUS_POKECEN = 2F 01 +MUS_SANTOAN = 30 01 +MUS_NAMINORI = 31 01 +MUS_P_TOWER = 32 01 +MUS_SHIRUHU = 33 01 +MUS_HANADA = 34 01 +MUS_TAMAMUSI = 35 01 +MUS_WIN_TRE = 36 01 +MUS_WIN_YASEI = 37 01 +MUS_WIN_GYM = 38 01 +MUS_KUCHIBA = 39 01 +MUS_NIBI = 3A 01 +MUS_RIVAL1 = 3B 01 +MUS_RIVAL2 = 3C 01 +MUS_FAN2 = 3D 01 +MUS_FAN5 = 3E 01 +MUS_FAN6 = 3F 01 +MUS_ME_PHOTO = 40 01 +MUS_TITLEROG = 41 01 +MUS_GET_YASEI = 42 01 +MUS_SOUSA = 43 01 +MUS_SEKAIKAN = 44 01 +MUS_SEIBETU = 45 01 +MUS_JUMP = 46 01 +MUS_UNION = 47 01 +MUS_NETWORK = 48 01 +MUS_OKURIMONO = 49 01 +MUS_KINOMIKUI = 4A 01 +MUS_NANADUNGEON = 4B 01 +MUS_OSHIE_TV = 4C 01 +MUS_NANASHIMA = 4D 01 +MUS_NANAISEKI = 4E 01 +MUS_NANA123 = 4F 01 +MUS_NANA45 = 50 01 +MUS_NANA67 = 51 01 +MUS_POKEFUE = 52 01 +MUS_VS_DEO = 53 01 +MUS_VS_MYU2 = 54 01 +MUS_VS_DEN = 55 01 +MUS_EXEYE = 56 01 +MUS_DEOEYE = 57 01 +MUS_T_TOWER = 58 01 +MUS_SLOWMASARA = 59 01 +MUS_TVNOIZE = 5A 01 '\l' = FA @ scroll up window text '\p' = FB @ new paragraph diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index e45575959..abfd0d550 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -745,7 +745,7 @@ gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 compare_var_to_value VAR_0x8002, MUS_FANFA1 call_if 1, EventScript_1A4EA2 - compare_var_to_value VAR_0x8002, BGM_FRLG_ME_KEYITEM + compare_var_to_value VAR_0x8002, MUS_FAN5 call_if 1, EventScript_1A4EA6 message 0x0 waitmessage @@ -763,7 +763,7 @@ EventScript_1A4EA2:: @ 81A4EA2 return EventScript_1A4EA6:: @ 81A4EA6 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 return EventScript_1A4EAA:: @ 81A4EAA diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index f00cd73f2..136a57b6a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -78,7 +78,7 @@ EventScript_1652C0:: @ 81652C0 setfieldeffectarg 1, 56 setfieldeffectarg 2, 2 dofieldeffect 68 - playbgm BGM_FRLG_DEOXYS_EYE, 0 + playbgm MUS_DEOEYE, 0 waitfieldeffect 68 applymovement 2, Movement_165353 waitmovement 0 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 3c3483967..f1133090e 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY", "name": "CeladonCity", "layout": "LAYOUT_CELADON_CITY", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 5665a7f51..cb315ade8 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", "name": "CeladonCity_Condominiums_1F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 1fdfd5746..e460de793 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", "name": "CeladonCity_Condominiums_2F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 0a98c9d67..4a405c3f1 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", "name": "CeladonCity_Condominiums_3F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index cbbb754bb..7680f5f68 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", "name": "CeladonCity_Condominiums_Roof", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index aa15b14a5..aee589439 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", "name": "CeladonCity_Condominiums_RoofRoom", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 67badf749..412eb4008 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", "name": "CeladonCity_DepartmentStore_1F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 7363a2af5..42d5c76f5 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", "name": "CeladonCity_DepartmentStore_2F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 2c0cf0fbc..21780d544 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", "name": "CeladonCity_DepartmentStore_3F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 37c0841f7..8598fbae4 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", "name": "CeladonCity_DepartmentStore_4F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 691d9ff7c..12e86270d 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", "name": "CeladonCity_DepartmentStore_5F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 7a2c88c84..a2a7d1b48 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "CeladonCity_DepartmentStore_Elevator", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 470ea3dd1..fc4f32491 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", "name": "CeladonCity_DepartmentStore_Roof", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 1c7ee50df..9bdd93dee 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -274,7 +274,7 @@ EventScript_16C0CB:: @ 816C0CB call_if 1, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 - playse SE_C_PASI + playse SE_JIHANKI msgbox gUnknown_8196076 additem VAR_0x4000, 1 goto EventScript_16C125 diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index a3b1df6f4..006c6ae0b 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER", "name": "CeladonCity_GameCorner", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", - "music": "BGM_FRLG_GAMECORNER", + "music": "MUS_SLOT", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 9115b2812..1ab7bcdf4 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -74,7 +74,7 @@ EventScript_16C734:: @ 816C734 EventScript_16C762:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 - playse SE_CASHIER + playse SE_SHOP msgbox gUnknown_8196A62 goto EventScript_16C77A end @@ -142,7 +142,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 givecoins 10 textcolor 3 msgbox gUnknown_8196B0D - playse SE_CASHIER + playse SE_SHOP waitse setflag FLAG_0x26E goto EventScript_16C7CA @@ -206,7 +206,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E givecoins 20 textcolor 3 msgbox gUnknown_8196D47 - playse SE_CASHIER + playse SE_SHOP waitse setflag FLAG_0x26F goto EventScript_16C7CA @@ -236,7 +236,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 - playse SE_CASHIER + playse SE_SHOP waitse setflag FLAG_0x270 goto EventScript_16C7CA @@ -418,7 +418,7 @@ CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA end EventScript_16CABE:: @ 816CABE - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN setmetatile 15, 2, 669, 0 setmetatile 16, 2, 670, 1 setmetatile 17, 2, 671, 1 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 3e37651f5..d4085c047 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", "name": "CeladonCity_GameCorner_PrizeRoom", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index d294cb8eb..15647d28f 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GYM", "name": "CeladonCity_Gym", "layout": "LAYOUT_CELADON_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 27d1a6a21..02c39a95c 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -24,7 +24,7 @@ Text_197114:: @ 8197114 .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM BGM_FRLG_LEADER_EYE}$" + .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" Text_197260:: @ 8197260 .string "Oh!\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 5959cc9aa..0bb559faf 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOTEL", "name": "CeladonCity_Hotel", "layout": "LAYOUT_CELADON_CITY_HOTEL", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 900c123a0..40d610292 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOUSE1", "name": "CeladonCity_House1", "layout": "LAYOUT_HOUSE5", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 800dfbecf..57eee5a1d 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", "name": "CeladonCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 622a168d4..faa029c1f 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", "name": "CeladonCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index eb7afdbe2..1abb5c5ae 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_RESTAURANT", "name": "CeladonCity_Restaurant", "layout": "LAYOUT_CELADON_CITY_RESTAURANT", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 64bf8c583..4479d1792 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_1F", "name": "CeruleanCave_1F", "layout": "LAYOUT_CERULEAN_CAVE_1F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 4b747735b..73fd1877f 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_2F", "name": "CeruleanCave_2F", "layout": "LAYOUT_CERULEAN_CAVE_2F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 0dd6edb8c..8ad1ef685 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_B1F", "name": "CeruleanCave_B1F", "layout": "LAYOUT_CERULEAN_CAVE_B1F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index f2ac16317..c12eaff5a 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -37,7 +37,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitmessage waitmoncry delay 20 - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_0x807 diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index df48d28c0..a387eeb28 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY", "name": "CeruleanCity", "layout": "LAYOUT_CERULEAN_CITY", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 480a40ad0..658d2a393 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -37,7 +37,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9 EventScript_1664CC:: @ 81664CC textcolor 0 setvar VAR_0x4054, 2 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 8 applymovement 8, Movement_1665D3 waitmovement 0 @@ -54,7 +54,7 @@ EventScript_1664CC:: @ 81664CC special SetFlavorTextFlagFromSpecialVars msgbox gUnknown_817EB95 closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_1665A3 compare_var_to_value VAR_0x4001, 1 @@ -177,7 +177,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 goto_if_eq EventScript_16662E message Text_17EE0E waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 waitbuttonpress trainerbattle 3, 355, 0, Text_17EE70 setvar VAR_0x407D, 1 diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 9a6c42035..be5b0b94c 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -52,7 +52,7 @@ Text_17EE0E:: @ 817EE0E .string "…Huh?\n" .string "Me?\p" .string "I'm an innocent bystander!\n" - .string "Don't you believe me?{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$" + .string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$" Text_17EE70:: @ 817EE70 .string "GRUNT: Stop! I give up!\n" diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 51ac0c1a6..0f56bc949 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_BIKE_SHOP", "name": "CeruleanCity_BikeShop", "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 51b7ba5bd..df14fb201 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -33,7 +33,7 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 msgbox gUnknown_81927B2 - giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 setflag FLAG_0x271 additem ITEM_BICYCLE, 1 removeitem ITEM_BIKE_VOUCHER, 1 diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index a662cdf74..ad41f1e70 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_GYM", "name": "CeruleanCity_Gym", "layout": "LAYOUT_CERULEAN_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc index 5f253b875..c26994bfb 100644 --- a/data/maps/CeruleanCity_Gym/text.inc +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -5,7 +5,7 @@ Text_1921EF:: @ 81921EF .string "What is your approach when you\n" .string "catch and train POKéMON?\p" .string "My policy is an all-out offensive\n" - .string "with WATER-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" gUnknown_81922BF:: @ 81922BF .string "TM03 teaches WATER PULSE.\p" diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 248ba5b3f..51f0db0ca 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE1", "name": "CeruleanCity_House1", "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 207ca1f40..6865c93a0 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE2", "name": "CeruleanCity_House2", "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index e74a6a675..829ae2084 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE3", "name": "CeruleanCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 2fdf6ad1e..ee56f7d91 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE4", "name": "CeruleanCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index c96495d4a..489ae791f 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE5", "name": "CeruleanCity_House5", "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 7f3076e12..e29ff56dd 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_MART", "name": "CeruleanCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 16132e565..f80669fac 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", "name": "CeruleanCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index d5460e28f..228bfa8a3 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", "name": "CeruleanCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 4b680f47f..5e2726a36 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND", "name": "CinnabarIsland", "layout": "LAYOUT_CINNABAR_ISLAND", - "music": "BGM_FRLG_CINNABAR_ISLAND", + "music": "MUS_GUREN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 90d564eff..556fde4de 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -15,7 +15,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 end EventScript_166F0B:: @ 8166F0B - savebgm BGM_FRLG_FOLLOW_ME + savebgm MUS_ANNAI setflag FLAG_0x002 setobjectxyperm 3, 15, 12 setobjectmovementtype 3, 9 diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index c583ac2f9..83cc3ffc0 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_GYM", "name": "CinnabarIsland_Gym", "layout": "LAYOUT_CINNABAR_ISLAND_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 87461a536..20c00f117 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -263,7 +263,7 @@ EventScript_16DC43:: @ 816DC43 end EventScript_16DC58:: @ 816DC58 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E117 special DrawWholeMapView @@ -346,7 +346,7 @@ EventScript_16DD1C:: @ 816DD1C end EventScript_16DD31:: @ 816DD31 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E157 special DrawWholeMapView @@ -434,7 +434,7 @@ EventScript_16DDFA:: @ 816DDFA end EventScript_16DE0F:: @ 816DE0F - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E197 special DrawWholeMapView @@ -513,7 +513,7 @@ EventScript_16DED1:: @ 816DED1 end EventScript_16DEE6:: @ 816DEE6 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E1D7 special DrawWholeMapView @@ -592,7 +592,7 @@ EventScript_16DFA8:: @ 816DFA8 end EventScript_16DFBD:: @ 816DFBD - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E1F3 special DrawWholeMapView @@ -671,7 +671,7 @@ EventScript_16E07F:: @ 816E07F end EventScript_16E094:: @ 816E094 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse call EventScript_16E233 special DrawWholeMapView diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index e5ceccbd4..c09e8b791 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -6,7 +6,7 @@ Text_199543:: @ 8199543 .string "and ready with intense heat!\p" .string "They incinerate all challengers!\p" .string "Hah!\n" - .string "You better have BURN HEAL!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$" Text_1995FA:: @ 81995FA .string "I have burned down to nothing!\n" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index fa0972302..1d40fc33d 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_MART", "name": "CinnabarIsland_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 134d89ac8..e14c68123 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", "name": "CinnabarIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 53eb545d6..e85ebefc9 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage - playbgm BGM_FRLG_FOLLOW_ME, 1 - savebgm BGM_FRLG_FOLLOW_ME + playbgm MUS_ANNAI, 1 + savebgm MUS_ANNAI setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_0x0A2 delay 20 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 181acc569..258320b9b 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", "name": "CinnabarIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index f1ee3023b..4c0d5d33a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", "name": "CinnabarIsland_PokemonLab_Entrance", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "music": "BGM_FRLG_CINNABAR_ISLAND", + "music": "MUS_GUREN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 7c7ac1268..c0bd22e9d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", "name": "CinnabarIsland_PokemonLab_ExperimentRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", - "music": "BGM_FRLG_CINNABAR_ISLAND", + "music": "MUS_GUREN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 1d9e1aa0e..a7af3e0c9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", "name": "CinnabarIsland_PokemonLab_Lounge", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", - "music": "BGM_FRLG_CINNABAR_ISLAND", + "music": "MUS_GUREN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 83f6135b7..42fc53a4c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", "name": "CinnabarIsland_PokemonLab_ResearchRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", - "music": "BGM_FRLG_CINNABAR_ISLAND", + "music": "MUS_GUREN", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 202d9fb6a..0b5479841 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_B1F", "name": "DiglettsCave_B1F", "layout": "LAYOUT_DIGLETTS_CAVE_B1F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 1529d8592..1ee6434d7 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", "name": "DiglettsCave_NorthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 27a17103e..c62cc1258 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", "name": "DiglettsCave_SouthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 0a087cd74..5dd4a4ac4 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND", "name": "FiveIsland", "layout": "LAYOUT_FIVE_ISLAND", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index f99fced10..835b1ef31 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HARBOR", "name": "FiveIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 817d17cda..45ac73f0f 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE1", "name": "FiveIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index e9254cf3c..d9b1ca36e 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE2", "name": "FiveIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index e34db7ec9..4d044b6de 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", "name": "FiveIsland_LostCave_Entrance", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 80c4a3ee1..46a9371be 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", "name": "FiveIsland_LostCave_Room1", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index d155f030a..af59dbf68 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", "name": "FiveIsland_LostCave_Room10", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index c7e948840..1bb718599 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", "name": "FiveIsland_LostCave_Room11", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index da0d9ca31..19a4d07fb 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", "name": "FiveIsland_LostCave_Room12", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index cef031273..12c0a2295 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", "name": "FiveIsland_LostCave_Room13", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 025120be6..0d5204697 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", "name": "FiveIsland_LostCave_Room14", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 59da7ae72..25a7996e6 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", "name": "FiveIsland_LostCave_Room2", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 129c50fe9..885c75d45 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", "name": "FiveIsland_LostCave_Room3", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 98b31bca3..da9555287 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", "name": "FiveIsland_LostCave_Room4", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 1df784d77..ee295239d 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", "name": "FiveIsland_LostCave_Room5", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index 5a6be0290..cd6663ce8 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", "name": "FiveIsland_LostCave_Room6", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index b18af46f7..144f2099b 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", "name": "FiveIsland_LostCave_Room7", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 72057fbd1..270a99c8f 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", "name": "FiveIsland_LostCave_Room8", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 54b9d6d2e..ee2945b8d 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", "name": "FiveIsland_LostCave_Room9", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index cda0c4f2c..2d374bd56 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEADOW", "name": "FiveIsland_Meadow", "layout": "LAYOUT_FIVE_ISLAND_MEADOW", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 30418fb84..0f7ba8199 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", "name": "FiveIsland_MemorialPillar", "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index e0e708bd2..af0f12fde 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", "name": "FiveIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index e6b4d237b..d1c083cb7 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", "name": "FiveIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index dc53baf54..b9f0c8179 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", "name": "FiveIsland_ResortGorgeous", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index f960fe89d..60c8196d3 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", "name": "FiveIsland_ResortGorgeous_House", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 2c45cdf29..bf53c4597 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", "name": "FiveIsland_RocketWarehouse", "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 97a0961fd..173c247da 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", "name": "FiveIsland_WaterLabyrinth", "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index b167e2ba0..e920ba0af 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND", "name": "FourIsland", "layout": "LAYOUT_FOUR_ISLAND", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 3e4348e7b..8da7aef54 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -31,7 +31,7 @@ EventScript_167CEC:: @ 8167CEC textcolor 0 applymovement 10, Movement_1A75ED waitmovement 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 10, Movement_1A75DB waitmovement 0 applymovement 10, Movement_1A75DD diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 2ec5e402b..e7507d3fe 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HARBOR", "name": "FourIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 99eb97da3..a33509d0c 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE1", "name": "FourIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 6811c33ae..bfb59deeb 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE2", "name": "FourIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 00fa4bac0..9a9bb955a 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", "name": "FourIsland_IcefallCave_1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 866c0c578..451541b8c 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -21,7 +21,7 @@ EventScript_163D65:: @ 8163D65 delay 20 applymovement 255, Movement_163D7F waitmovement 0 - playse SE_FU_ZAKU + playse SE_RU_HYUU delay 60 warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 940d888f1..709b24259 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", "name": "FourIsland_IcefallCave_B1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 0b3ca6e97..6be98b468 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", "name": "FourIsland_IcefallCave_Back", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index b2451b2ec..7054d0a18 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -42,7 +42,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 waitmovement 0 applymovement 2, Movement_163EE8 waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index babdb41da..3315c36b5 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", "name": "FourIsland_IcefallCave_Entrance", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 9c73e30f2..45784f529 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", "name": "FourIsland_LoreleisHouse", "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 4fbd02275..ca5cba0ec 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_MART", "name": "FourIsland_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 0ff5c17c2..45d65222d 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", "name": "FourIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index f66cce064..a118bf9bb 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", "name": "FourIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index b9c45365a..812097722 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", "name": "FourIsland_PokemonDayCare", "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", - "music": "BGM_FRLG_ISLAND_FOUR", + "music": "MUS_NANA45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 050e17c06..394b29334 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -134,7 +134,7 @@ EventScript_171B05:: @ 8171B05 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_T_KAMI2 + playse SE_REGI msgbox gUnknown_81BFA67 waitse playmoncry VAR_RESULT, 0 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 4fc30ef40..deb0dc7c0 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY", "name": "FuchsiaCity", "layout": "LAYOUT_FUCHSIA_CITY", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index eea444164..2d567eaaf 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_BUILDING1", "name": "FuchsiaCity_Building1", "layout": "LAYOUT_FUCHSIA_CITY_BUILDING1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index c1106fb9c..ff7e432c2 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_GYM", "name": "FuchsiaCity_Gym", "layout": "LAYOUT_FUCHSIA_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc index 3967461b5..cb5ce932e 100644 --- a/data/maps/FuchsiaCity_Gym/text.inc +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -9,7 +9,7 @@ Text_19832E:: @ 819832E .string "Poison brings steady doom.\n" .string "Sleep renders foes helpless.\p" .string "Despair to the creeping horror of\n" - .string "POISON-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "POISON-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" Text_198444:: @ 8198444 .string "Humph!\n" diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 8e4d8ad8c..7f6e645b4 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE1", "name": "FuchsiaCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 0e443e100..5aeaa2b32 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE2", "name": "FuchsiaCity_House2", "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index dc819ebfc..2267848fc 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE3", "name": "FuchsiaCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index bfd8fe520..fcdd61d33 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_MART", "name": "FuchsiaCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index bbf19625b..4b711686d 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", "name": "FuchsiaCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 62e56bf0b..6b0547ad4 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", "name": "FuchsiaCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index d986f0c05..bbfc3846f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", "name": "FuchsiaCity_SafariZone_Entrance", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index de3962e96..39114ccdb 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_ZOO_BUILDING", "name": "FuchsiaCity_ZooBuilding", "layout": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index de82d21e1..90973993a 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_EXTERIOR", "name": "IndigoPlateau_Exterior", "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 8e7705650..a3112a2cf 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -10,7 +10,7 @@ IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 end EventScript_167255:: @ 8167255 - playbgm BGM_FRLG_CREDITS, 0 + playbgm MUS_ENDING, 0 return IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index a68bf374b..3d9919ed1 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", "name": "IndigoPlateau_PokemonCenter_1F", "layout": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 5273ed61a..646c4d178 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", "name": "IndigoPlateau_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 32071e5d2..a7c2dcd10 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN", "name": "LavenderTown", "layout": "LAYOUT_LAVENDER_TOWN", - "music": "BGM_FRLG_LAVENDER_TOWN", + "music": "MUS_SHION", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index b7b255588..d733b6630 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE1", "name": "LavenderTown_House1", "layout": "LAYOUT_HOUSE5", - "music": "BGM_FRLG_LAVENDER_TOWN", + "music": "MUS_SHION", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index fd7ec4f22..aa17b7d39 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE2", "name": "LavenderTown_House2", "layout": "LAYOUT_HOUSE5", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 441f67cdd..b944ac24e 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_MART", "name": "LavenderTown_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 17ab5ac45..4ef87ccf2 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", "name": "LavenderTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 8b3675c0f..31112697f 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", "name": "LavenderTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index f5d78cec5..7a917e264 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", "name": "LavenderTown_VolunteerPokemonHouse", "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", - "music": "BGM_FRLG_LAVENDER_TOWN", + "music": "MUS_SHION", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index f1a079cde..6229bf246 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -12,7 +12,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if_eq EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 - giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 msgbox gUnknown_81937E5 release end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 165086636..7da817efd 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_EXTERIOR", "name": "MtEmber_Exterior", "layout": "LAYOUT_MT_EMBER_EXTERIOR", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 4ff35116d..acd440a97 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -41,7 +41,7 @@ EventScript_16399E:: @ 816399E EventScript_1639A8:: @ 81639A8 applymovement 2, Movement_1A75E1 waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 trainerbattle 3, 537, 0, Text_17AA34 msgbox gUnknown_817AA3F @@ -80,7 +80,7 @@ EventScript_163A1B:: @ 8163A1B end EventScript_163A25:: @ 8163A25 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 trainerbattle 3, 538, 0, Text_17AA8A msgbox gUnknown_817AA99 diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index dfd51b629..af7c2032f 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_1F", "name": "MtEmber_RubyPath_1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index e60856ad9..3a95580b2 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F", "name": "MtEmber_RubyPath_B1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index c8175b887..78149246d 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", "name": "MtEmber_RubyPath_B1F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 919bcc7c3..e296e9318 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F", "name": "MtEmber_RubyPath_B2F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index e1a7e7dbe..42576cb8d 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", "name": "MtEmber_RubyPath_B2F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index bd2088c30..5bc2edf77 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B3F", "name": "MtEmber_RubyPath_B3F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index bc9266e8b..fb7b397e2 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -8,6 +8,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setflag FLAG_0x2DD removeobject 1 additem ITEM_RUBY, 1 - giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 release end diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 611d87ef4..42d8ee7f2 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B4F", "name": "MtEmber_RubyPath_B4F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index e6b80acc1..637afcde5 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B5F", "name": "MtEmber_RubyPath_B5F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 711f6f57d..34eb9d6a7 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT", "name": "MtEmber_Summit", "layout": "LAYOUT_MT_EMBER_SUMMIT", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 3de162df2..05472f91c 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -38,7 +38,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 waitmessage waitmoncry delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_0x807 special sub_807F9D8 diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 16438a729..7b06ec6ba 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", "name": "MtEmber_SummitPath_1F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 161cdff31..62da287fd 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", "name": "MtEmber_SummitPath_2F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 0d2f4c7b3..3e1d8dc50 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", "name": "MtEmber_SummitPath_3F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 314eedb18..135f731fc 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_1F", "name": "MtMoon_1F", "layout": "LAYOUT_MT_MOON_1F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index 44e8bec9d..efa18b859 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B1F", "name": "MtMoon_B1F", "layout": "LAYOUT_MT_MOON_B1F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 093b40917..ad5ea2d86 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B2F", "name": "MtMoon_B2F", "layout": "LAYOUT_MT_MOON_B2F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 1947a3eb2..c8cf811c0 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -35,7 +35,7 @@ EventScript_1606DD:: @ 81606DD textcolor 0 message Text_172B64 waitmessage - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 trainerbattle 3, 170, 0, Text_172B99 @@ -61,7 +61,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B goto_if_eq EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B waitmovement 0 moveobjectoffscreen 3 textcolor 0 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_172BD6 waitmessage waitfanfare @@ -94,7 +94,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F goto_if_eq EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -102,7 +102,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F waitmovement 0 moveobjectoffscreen 3 textcolor 0 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_172BD6 waitmessage waitfanfare diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 9cbfb1918..4f0bc37bc 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_1F", "name": "NavelRock_1F", "layout": "LAYOUT_NAVEL_ROCK_1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 643051c4a..4807cf865 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_B1F", "name": "NavelRock_B1F", "layout": "LAYOUT_NAVEL_ROCK_B1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 50742576b..aa97091ec 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE", "name": "NavelRock_Base", "layout": "LAYOUT_NAVEL_ROCK_BASE", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 8818c1d01..78c468022 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -41,14 +41,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134 faceplayer waitse delay 20 - playse SE_FUUSEN2 + playse SE_T_AME_E setvar VAR_0x8004, 0 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 2 special sub_80CAC28 delay 30 - playse SE_FUUSEN2 + playse SE_T_AME_E setvar VAR_0x8004, 0 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 41aaa26fe..16c0363a8 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", "name": "NavelRock_BasePath_B10F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index ca63d3f42..9530b8ca8 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", "name": "NavelRock_BasePath_B11F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index d91ec836f..e2d8103eb 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", "name": "NavelRock_BasePath_B1F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 795341b0d..df3200d16 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", "name": "NavelRock_BasePath_B2F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 9ecce5260..65e25b3ec 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", "name": "NavelRock_BasePath_B3F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index e4b6728a1..fd56529fb 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", "name": "NavelRock_BasePath_B4F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 2a66f9652..2d6e8798c 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", "name": "NavelRock_BasePath_B5F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 4d0f797b0..0f5e92ad9 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", "name": "NavelRock_BasePath_B6F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index 053282a88..1c2897d91 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", "name": "NavelRock_BasePath_B7F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index d46e80168..1f3445dee 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", "name": "NavelRock_BasePath_B8F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index 43440ca9c..9c6a50590 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", "name": "NavelRock_BasePath_B9F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 8660ec6af..adaa0e703 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_EXTERIOR", "name": "NavelRock_Exterior", "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 55dc110b9..c7b72356c 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_FORK", "name": "NavelRock_Fork", "layout": "LAYOUT_NAVEL_ROCK_FORK", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 1cd74326e..dee041a54 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_HARBOR", "name": "NavelRock_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 84bb51d62..62a375525 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT", "name": "NavelRock_Summit", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index 5ed9016d8..7cdb412db 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", "name": "NavelRock_SummitPath_2F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 02873fa1a..3d8db3367 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", "name": "NavelRock_SummitPath_3F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index cb655601a..d83e5c97f 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", "name": "NavelRock_SummitPath_4F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 4ff37dd34..4db860493 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", "name": "NavelRock_SummitPath_5F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 3a1bc3f42..0bd30ba71 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND", "name": "OneIsland", "layout": "LAYOUT_ONE_ISLAND", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 553c9156a..6a8cbe4b2 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HARBOR", "name": "OneIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 17900e786..7367836f7 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE1", "name": "OneIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 2eb71606a..d88b79750 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE2", "name": "OneIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index b14e36b13..74023f6d0 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD", "name": "OneIsland_KindleRoad", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 1fc1d1cc4..71bbbe0dd 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", "name": "OneIsland_KindleRoad_EmberSpa", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index ae6597955..4c6527a0a 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", "name": "OneIsland_PokemonCenter_1F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "music": "MUS_NETWORK", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 83a42e67d..bb4e0f765 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -104,13 +104,13 @@ EventScript_170CB1:: @ 8170CB1 applymovement 255, Movement_1A75E9 waitmovement 0 msgbox gUnknown_81A0FB1 - giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 additem ITEM_METEORITE, 1 applymovement 3, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A1113 additem ITEM_TRI_PASS, 1 - giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 compare_var_to_value VAR_0x4058, 2 call_if 4, EventScript_170E46 @@ -138,7 +138,7 @@ EventScript_170E3D:: @ 8170E3D EventScript_170E46:: @ 8170E46 textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_1A11EC waitmessage waitfanfare @@ -149,7 +149,7 @@ EventScript_170E58:: @ 8170E58 setflag FLAG_0x039 setvar VAR_0x4058, 2 additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return Movement_170E7D:: @ 8170E7D @@ -279,7 +279,7 @@ EventScript_170FA5:: @ 8170FA5 closemessage applymovement 3, Movement_171142 waitmovement 0 - playse SE_N + playse SE_TK_KASYA call EventScript_170C2C special DrawWholeMapView msgbox gUnknown_81A1D45 @@ -323,7 +323,7 @@ EventScript_171044:: @ 8171044 closemessage applymovement 3, Movement_171142 waitmovement 0 - playse SE_N + playse SE_TK_KASYA call EventScript_170C22 special DrawWholeMapView delay 30 @@ -350,11 +350,11 @@ EventScript_1710B2:: @ 81710B2 additem ITEM_RAINBOW_PASS, 1 setflag FLAG_0x846 textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_1A1B56 waitmessage waitfanfare - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_1A1B8E waitmessage waitfanfare diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index f233af596..616c96a7c 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", "name": "OneIsland_PokemonCenter_2F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "music": "MUS_NETWORK", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 74517e890..b1e946ea0 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_TREASURE_BEACH", "name": "OneIsland_TreasureBeach", "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 224a99322..4b4acaf09 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN", "name": "PalletTown", "layout": "LAYOUT_PALLET_TOWN", - "music": "BGM_FRLG_PALLET_TOWN", + "music": "MUS_MASARA", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index c1790fb90..ed53b8518 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -63,7 +63,7 @@ EventScript_1654D8:: @ 81654D8 goto_if 0, EventScript_165593 msgbox gUnknown_817D9AA closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 + playbgm MUS_ANNAI, 0 applymovement 255, Movement_1655DD applymovement 3, Movement_1655CC waitmovement 0 @@ -189,7 +189,7 @@ EventScript_165605:: @ 8165605 special UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 - playbgm BGM_FRLG_PROF_OAK, 0 + playbgm MUS_OHKIDO, 0 message Text_17D72C waitmessage delay 85 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 5db9cb1f6..c5522db0b 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_GARYS_HOUSE", "name": "PalletTown_GarysHouse", "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "music": "BGM_FRLG_PALLET_TOWN", + "music": "MUS_MASARA", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 9f304b583..d165036fb 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -156,7 +156,7 @@ EventScript_168EF6:: @ 8168EF6 waitmovement 0 delay 12 additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 3db904de7..ad29c0e04 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", "name": "PalletTown_PlayersHouse_1F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", - "music": "BGM_FRLG_PALLET_TOWN", + "music": "MUS_MASARA", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index dd470b406..61e354782 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", "name": "PalletTown_PlayersHouse_2F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", - "music": "BGM_FRLG_PALLET_TOWN", + "music": "MUS_MASARA", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 9d74bea9c..c7440708c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", "name": "PalletTown_ProfessorOaksLab", "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "music": "BGM_FRLG_OAK_LAB", + "music": "MUS_KENKYU", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 449c31027..64bec30b1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -27,7 +27,7 @@ EventScript_168FC0:: @ 8168FC0 EventScript_168FC6:: @ 8168FC6 setobjectxyperm 4, 6, 11 setobjectmovementtype 4, 7 - savebgm BGM_FRLG_PROF_OAK + savebgm MUS_OHKIDO return EventScript_168FD5:: @ 8168FD5 @@ -110,7 +110,7 @@ EventScript_169035:: @ 8169035 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_16986D textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_18F0E8 waitmessage waitfanfare @@ -119,7 +119,7 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F103 msgbox gUnknown_818F1DB closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169B69 compare_var_to_value VAR_FACING, 1 @@ -137,7 +137,7 @@ EventScript_169035:: @ 8169035 EventScript_169174:: @ 8169174 setobjectxyperm 8, 5, 10 addobject 8 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 255, Movement_169B94 applymovement 8, Movement_169B9D waitmovement 0 @@ -146,7 +146,7 @@ EventScript_169174:: @ 8169174 EventScript_169194:: @ 8169194 setobjectxyperm 8, 6, 10 addobject 8 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 4, Movement_1A75ED applymovement 255, Movement_169B91 applymovement 8, Movement_169B9D @@ -156,7 +156,7 @@ EventScript_169194:: @ 8169194 EventScript_1691BB:: @ 81691BB setobjectxyperm 8, 6, 10 addobject 8 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 4, Movement_1A75ED applymovement 8, Movement_169B9D waitmovement 0 @@ -302,7 +302,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF EventScript_16930B:: @ 816930B textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 8, Movement_1A75ED waitmovement 0 applymovement 255, Movement_1A75E9 @@ -491,7 +491,7 @@ EventScript_1694C2:: @ 81694C2 special sp000_heal_pokemon msgbox gUnknown_818DE38 closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4002, 1 call_if 1, EventScript_169504 compare_var_to_value VAR_0x4002, 2 @@ -642,7 +642,7 @@ EventScript_16961E:: @ 816961E call EventScript_1A6675 removeitem ITEM_OAKS_PARCEL, 1 msgbox gUnknown_818E4CA - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage compare_var_to_value VAR_FACING, 2 @@ -701,7 +701,7 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_16986D delay 10 textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_18E5EA waitmessage waitfanfare @@ -728,7 +728,7 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169B69 compare_var_to_value VAR_FACING, 1 @@ -1212,7 +1212,7 @@ EventScript_169C74:: @ 8169C74 getspeciesname 0, VAR_0x4002 message Text_18E30D waitmessage - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 @@ -1263,7 +1263,7 @@ EventScript_169D2F:: @ 8169D2F getspeciesname 0, VAR_0x4003 message Text_18DD52 waitmessage - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 checkflag FLAG_0x83E diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 4db31c4ce..a3e8f4d40 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY", "name": "PewterCity", "layout": "LAYOUT_PEWTER_CITY", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 465f47f76..d4c461de2 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -12,7 +12,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D faceplayer msgbox gUnknown_817E67E closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 + playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 4 call_if 1, EventScript_165BD3 msgbox gUnknown_817E6C7 @@ -444,7 +444,7 @@ EventScript_165DBE:: @ 8165DBE textcolor 0 msgbox gUnknown_817E67E closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 + playbgm MUS_ANNAI, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_165E0A compare_var_to_value VAR_0x4001, 1 @@ -1037,7 +1037,7 @@ PewterCity_EventScript_16607E:: @ 816607E msgbox gUnknown_817E589 closemessage delay 10 - playbgm BGM_FRLG_FOLLOW_ME, 0 + playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_1660EE compare_var_to_value VAR_FACING, 1 @@ -1443,7 +1443,7 @@ EventScript_1662DE:: @ 81662DE call_if 1, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_17E970 waitmessage waitfanfare diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index bd7ae17c2..5893d6954 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_GYM", "name": "PewterCity_Gym", "layout": "LAYOUT_PEWTER_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index 31e5c61f0..7d7101fec 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -12,7 +12,7 @@ Text_190CD4:: @ 8190CD4 .string "That's the TRAINER's honor that\n" .string "compels you to challenge me.\p" .string "Fine, then!\n" - .string "Show me your best!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "Show me your best!{PLAY_BGM}{MUS_EXEYE}$" Text_190E4F:: @ 8190E4F .string "I took you for granted, and so\n" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index cb05ba932..d44ec63bf 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE1", "name": "PewterCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 368dc049c..83aaf23bf 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE2", "name": "PewterCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index ba1e82180..8b9c5e575 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MART", "name": "PewterCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 583d0f0db..8a4e54380 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_1F", "name": "PewterCity_Museum_1F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7540e74d5..275282638 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -87,7 +87,7 @@ EventScript_16A402:: @ 816A402 call_if 1, EventScript_16A460 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16A46B - playse SE_CASHIER + playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 waitse @@ -167,7 +167,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE setflag FLAG_0x25E removeobject 4 additem ITEM_OLD_AMBER, 1 - giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 release end diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 0fba1289f..317926b39 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_2F", "name": "PewterCity_Museum_2F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index efff5db0c..6807511b1 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", "name": "PewterCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 525eef027..dfaab8a86 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -22,11 +22,11 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 lock faceplayer fadeoutbgm 0 - playbgm BGM_FRLG_JIGGLYPUFF, 0 + playbgm MUS_PURIN, 0 message Text_1916EA waitmessage delay 455 - playbgm BGM_FRLG_POKEMON_CENTER, 1 + playbgm MUS_POKECEN, 1 release end diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index f50a1608c..37dd74cef 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", "name": "PewterCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 84f663e66..16b98cfda 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", "name": "PokemonLeague_AgathasRoom", "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index 24c44d812..8a29f185d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -11,7 +11,7 @@ gUnknown_817844D:: @ 817844D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" gUnknown_817858D:: @ 817858D .string "I am AGATHA of the ELITE FOUR.\p" @@ -26,7 +26,7 @@ gUnknown_817858D:: @ 817858D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" Text_1786D7:: @ 81786D7 .string "Oh, my!\n" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index bb94a0bbe..05cc19dbe 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", "name": "PokemonLeague_BrunosRoom", "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index 516da0437..57c66a96b 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -9,7 +9,7 @@ gUnknown_817820F:: @ 817820F .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" gUnknown_817830C:: @ 817830C .string "I am BRUNO of the ELITE FOUR!\p" @@ -22,7 +22,7 @@ gUnknown_817830C:: @ 817830C .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" Text_178409:: @ 8178409 .string "Why?\n" diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index cf1c5bfa2..90e243652 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", "name": "PokemonLeague_ChampionsRoom", "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index b2b8bc46c..b705e8c54 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -68,7 +68,7 @@ EventScript_162B76:: @ 8162B76 goto_if_eq EventScript_162C68 setflag FLAG_0x003 setflag FLAG_0x005 - savebgm BGM_FRLG_KACHI_LEADER + savebgm MUS_WIN_GYM checkflag FLAG_0x844 call_if 0, EventScript_162C6F checkflag FLAG_0x844 @@ -78,7 +78,7 @@ EventScript_162B76:: @ 8162B76 setflag FLAG_0x4BC setflag FLAG_0x004 msgbox gUnknown_8178F2F - playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 + playbgm MUS_SLOWMASARA, 0 addobject 2 msgbox gUnknown_8178FC6 closemessage diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index c2b3725fa..a2146d74b 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", "name": "PokemonLeague_HallOfFame", "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", - "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN", + "music": "MUS_SLOWMASARA", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index c844c29d9..1d962ccba 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", "name": "PokemonLeague_LancesRoom", "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 2eaebe6f7..b0a378a98 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -43,7 +43,7 @@ EventScript_162987:: @ 8162987 waitmovement 0 setflag FLAG_0x002 call EventScript_1629A8 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse setvar VAR_0x4068, 4 diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index ea0b7df7e..9565fd4d5 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -12,7 +12,7 @@ gUnknown_8178764:: @ 8178764 .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" gUnknown_81788BD:: @ 81788BD .string "Ah!\n" @@ -28,7 +28,7 @@ gUnknown_81788BD:: @ 81788BD .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" Text_178A15:: @ 8178A15 .string "That's it!\p" diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 33b250e35..6435fd40f 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", "name": "PokemonLeague_LoreleisRoom", "layout": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index 56beafa3d..9619ab86b 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -7,7 +7,7 @@ gUnknown_8177FA4:: @ 8177FA4 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" gUnknown_8178089:: @ 8178089 .string "Welcome to the POKéMON LEAGUE.\p" @@ -20,7 +20,7 @@ gUnknown_8178089:: @ 8178089 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" Text_178191:: @ 8178191 .string "…Things shouldn't be this way!$" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index fb42651aa..8c28b8d4a 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_1F", "name": "PokemonMansion_1F", "layout": "LAYOUT_POKEMON_MANSION_1F", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 3055cc30c..04a15a5e5 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -16,7 +16,7 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 lockall setvar VAR_0x8004, 0 call EventScript_1A7AE2 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 685e1dada..6a85dbb1e 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_2F", "name": "PokemonMansion_2F", "layout": "LAYOUT_POKEMON_MANSION_2F", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 275b7ac28..b9f052a4f 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -11,7 +11,7 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264 lockall setvar VAR_0x8004, 1 call EventScript_1A7AE2 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 9372efde9..c693a9d7a 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_3F", "name": "PokemonMansion_3F", "layout": "LAYOUT_POKEMON_MANSION_3F", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 5495e5964..4fb9e8bf0 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -11,7 +11,7 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 lockall setvar VAR_0x8004, 2 call EventScript_1A7AE2 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 0eac3643d..15627f664 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_B1F", "name": "PokemonMansion_B1F", "layout": "LAYOUT_POKEMON_MANSION_B1F", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index a09b2fa53..0997ae9f9 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -11,7 +11,7 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C lockall setvar VAR_0x8004, 3 call EventScript_1A7AE2 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index ec5026d87..ad49dce83 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_1F", "name": "PokemonTower_1F", "layout": "LAYOUT_POKEMON_TOWER_1F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index bcffe3fee..4aea2b3b7 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_2F", "name": "PokemonTower_2F", "layout": "LAYOUT_POKEMON_TOWER_2F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index f4657bbfc..929c24f60 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -19,7 +19,7 @@ PokemonTower_2F_EventScript_16329B:: @ 816329B EventScript_1632A7:: @ 81632A7 textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_163339 compare_var_to_value VAR_0x4001, 1 @@ -38,7 +38,7 @@ EventScript_1632A7:: @ 81632A7 call_if 1, EventScript_163373 msgbox gUnknown_8179DD4 closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16337E compare_var_to_value VAR_0x4001, 1 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 853179061..dcba6c23f 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_3F", "name": "PokemonTower_3F", "layout": "LAYOUT_POKEMON_TOWER_3F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index a1641b4e0..b567872bf 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_4F", "name": "PokemonTower_4F", "layout": "LAYOUT_POKEMON_TOWER_4F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 2609e8dfe..f8fb23938 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_5F", "name": "PokemonTower_5F", "layout": "LAYOUT_POKEMON_TOWER_5F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index ef96f5aa8..b331bed20 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_6F", "name": "PokemonTower_6F", "layout": "LAYOUT_POKEMON_TOWER_6F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 880589588..3f2fd739d 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_7F", "name": "PokemonTower_7F", "layout": "LAYOUT_POKEMON_TOWER_7F", - "music": "BGM_FRLG_POKEMON_TOWER", + "music": "MUS_P_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 21ffe2703..8647b0ae1 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -2,7 +2,7 @@ "id": "MAP_POWER_PLANT", "name": "PowerPlant", "layout": "LAYOUT_POWER_PLANT", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index cb9b3acdc..b70dc0f22 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -51,7 +51,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 waitmessage waitmoncry delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_0x807 special sub_807F9D8 diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 94d643a8c..59abc79f0 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_1F", "name": "RockTunnel_1F", "layout": "LAYOUT_ROCK_TUNNEL_1F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 3df881ece..0d2d1696e 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_B1F", "name": "RockTunnel_B1F", "layout": "LAYOUT_ROCK_TUNNEL_B1F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 0513b11d4..66aa5aad7 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B1F", "name": "RocketHideout_B1F", "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index f127389ef..1b4068e14 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -39,7 +39,7 @@ RocketHideout_B1F_EventScript_16120A:: @ 816120A EventScript_161225:: @ 8161225 call EventScript_16126A - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse release diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 55cb6f583..eff2b29af 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B2F", "name": "RocketHideout_B2F", "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 5e44100bc..77790c353 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B3F", "name": "RocketHideout_B3F", "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index fe5dc1de4..37df23d8f 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B4F", "name": "RocketHideout_B4F", "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 949223e85..f56e0a211 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -24,7 +24,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 special SetFlavorTextFlagFromSpecialVars message Text_175226 waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 waitbuttonpress trainerbattle 3, 348, 0, Text_175318 msgbox gUnknown_817532D @@ -112,7 +112,7 @@ EventScript_161433:: @ 8161433 end EventScript_161462:: @ 8161462 - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN special DrawWholeMapView waitse return diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 806a91cda..dd2191b6d 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", "name": "RocketHideout_Elevator", "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", - "music": "BGM_FRLG_ROCKET_HIDEOUT", + "music": "MUS_AJITO", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index eae0e3eb5..9532ffe65 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE1", "name": "Route1", "layout": "LAYOUT_ROUTE1", - "music": "BGM_FRLG_ROUTE_1", + "music": "MUS_LOAD01", "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 0038ec3d9..d7ec8b3c9 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10", "name": "Route10", "layout": "LAYOUT_ROUTE10", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 0dcb36f49..ad6d1d426 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_1F", "name": "Route10_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 599efb07c..ccb14b3db 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_2F", "name": "Route10_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 1403fe6de..27e2a7d76 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11", "name": "Route11", "layout": "LAYOUT_ROUTE11", - "music": "BGM_FRLG_ROUTE_11", + "music": "MUS_LOAD03", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index a4e6448b4..752346bbd 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", "name": "Route11_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index c6bdd37f5..767612c7b 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", "name": "Route11_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 76603c9d5..b15dc4525 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12", "name": "Route12", "layout": "LAYOUT_ROUTE12", - "music": "BGM_FRLG_ROUTE_11", + "music": "MUS_LOAD03", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 6628b4966..6706d8b02 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_FISHING_HOUSE", "name": "Route12_FishingHouse", "layout": "LAYOUT_HOUSE4", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 4eb283e56..7c4beb37a 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", "name": "Route12_NorthEntrance_1F", "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index b14f95f2c..4b1ed933e 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", "name": "Route12_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index f67b3f3b5..919048b8d 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE13", "name": "Route13", "layout": "LAYOUT_ROUTE13", - "music": "BGM_FRLG_ROUTE_11", + "music": "MUS_LOAD03", "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 95ba61886..38dc65678 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE14", "name": "Route14", "layout": "LAYOUT_ROUTE14", - "music": "BGM_FRLG_ROUTE_11", + "music": "MUS_LOAD03", "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 84f075445..cdf6e21d1 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15", "name": "Route15", "layout": "LAYOUT_ROUTE15", - "music": "BGM_FRLG_ROUTE_11", + "music": "MUS_LOAD03", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 81896d704..5d94699d2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", "name": "Route15_WestEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 3d72c90e1..aa86a9719 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", "name": "Route15_WestEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 50bcad08a..528dd30b6 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16", "name": "Route16", "layout": "LAYOUT_ROUTE16", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 834ef6ef6..c848e5b76 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_HOUSE", "name": "Route16_House", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CELADON_CITY", + "music": "MUS_TAMAMUSI", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index bcb49452d..8ee9a145a 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", "name": "Route16_NorthEntrance_1F", "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 85d1ccccb..22f87439e 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", "name": "Route16_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index f51773f86..104649674 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE17", "name": "Route17", "layout": "LAYOUT_ROUTE17", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index f18809806..48301e386 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18", "name": "Route18", "layout": "LAYOUT_ROUTE18", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 1342a562e..610a84f34 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", "name": "Route18_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index c8be7d1e5..3f981016e 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", "name": "Route18_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index afa7b3b03..111cf1b71 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE19", "name": "Route19", "layout": "LAYOUT_ROUTE19", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 92a7b66e8..33ed43697 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2", "name": "Route2", "layout": "LAYOUT_ROUTE2", - "music": "BGM_FRLG_ROUTE_1", + "music": "MUS_LOAD01", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 86db038c8..8f1011ad4 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE20", "name": "Route20", "layout": "LAYOUT_ROUTE20", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 1a5a65b84..e52d7ff94 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_NORTH", "name": "Route21_North", "layout": "LAYOUT_ROUTE21_NORTH", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 324dd7ea0..e863fbdb9 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_SOUTH", "name": "Route21_South", "layout": "LAYOUT_ROUTE21_SOUTH", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 5b6ea3621..c03b8068d 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22", "name": "Route22", "layout": "LAYOUT_ROUTE22", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index a116b73eb..6df018f2f 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -29,7 +29,7 @@ EventScript_1682BD:: @ 81682BD EventScript_1682BE:: @ 81682BE textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_168350 @@ -48,7 +48,7 @@ EventScript_1682BE:: @ 81682BE msgbox gUnknown_8188974 closemessage delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16839A compare_var_to_value VAR_0x4001, 1 @@ -195,7 +195,7 @@ EventScript_16841E:: @ 816841E EventScript_16841F:: @ 816841F textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16849C @@ -214,7 +214,7 @@ EventScript_16841F:: @ 816841F msgbox gUnknown_8188B29 closemessage delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 applymovement 1, Movement_1684DA waitmovement 0 fadedefaultbgm diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 2f341b5fc..f1f379416 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22_NORTH_ENTRANCE", "name": "Route22_NorthEntrance", "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 54238b10e..0daa60650 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE23", "name": "Route23", "layout": "LAYOUT_ROUTE23", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index f4b8dee3f..93dd519c1 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE24", "name": "Route24", "layout": "LAYOUT_ROUTE24", - "music": "BGM_FRLG_ROUTE_24", + "music": "MUS_OPENING", "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 91dfc90f0..dede3df50 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -57,7 +57,7 @@ EventScript_1686B9:: @ 81686B9 giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 trainerbattle 3, 356, 0, Text_188DDC diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index de4155fe6..9e10ec246 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25", "name": "Route25", "layout": "LAYOUT_ROUTE25", - "music": "BGM_FRLG_ROUTE_24", + "music": "MUS_OPENING", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 7777ee3da..ec9a5c284 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25_SEA_COTTAGE", "name": "Route25_SeaCottage", "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index cbcdba4e9..d613b42a5 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -63,7 +63,7 @@ EventScript_17059C:: @ 817059C applymovement 2, Movement_1706DB waitmovement 0 removeobject 2 - playse SE_EXPMAX + playse SE_C_MAKU_D closedoor 10, 3 waitdooranim setflag FLAG_0x002 @@ -114,7 +114,7 @@ EventScript_17064A:: @ 817064A compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1706BE additem ITEM_SS_TICKET, 1 - giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_0x235 setflag FLAG_0x031 setflag FLAG_0x234 @@ -191,7 +191,7 @@ EventScript_1706FA:: @ 81706FA call EventScript_1707B6 setvar VAR_0x8004, 1 special sub_809C4A8 - playse SE_FU_ZUZUZU + playse SE_TK_WARPIN special sub_809C5FC waitse call EventScript_1707B6 @@ -211,7 +211,7 @@ EventScript_1706FA:: @ 81706FA waitfanfare applymovement 127, Movement_1707C3 waitmovement 0 - playse SE_EXPMAX + playse SE_C_MAKU_D closedoor 3, 3 waitdooranim applymovement 1, Movement_170881 diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index cf6552f51..de3df77b1 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_EAST_BUILDING", "name": "Route2_EastBuilding", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 78d88e7e5..639be8eb0 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_HOUSE", "name": "Route2_House", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 06dfcb2ad..fab8a8b03 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", "name": "Route2_ViridianForest_NorthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 9fcf669d5..3f4e03f3e 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", "name": "Route2_ViridianForest_SouthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 7dd795ed8..de3d20cc8 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE3", "name": "Route3", "layout": "LAYOUT_ROUTE3", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 2afb866f2..7f4958b26 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4", "name": "Route4", "layout": "LAYOUT_ROUTE4", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 066ee63c6..f3401744c 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_1F", "name": "Route4_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 0852a5537..c6f93c618 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_2F", "name": "Route4_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 3cf8a29dc..8b047231e 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5", "name": "Route5", "layout": "LAYOUT_ROUTE5", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 18409b100..ca5aec3d2 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_POKEMON_DAY_CARE", "name": "Route5_PokemonDayCare", "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 488238a2e..d4b2409d3 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_SOUTH_ENTRANCE", "name": "Route5_SouthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 8f940ef20..24a67ce53 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6", "name": "Route6", "layout": "LAYOUT_ROUTE6", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 14bc8d2e4..efa911ca9 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6_NORTH_ENTRANCE", "name": "Route6_NorthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 01f22d853..72556b9fd 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7", "name": "Route7", "layout": "LAYOUT_ROUTE7", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index a5c53552a..1609edf7d 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7_EAST_ENTRANCE", "name": "Route7_EastEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 53f7be9f0..45b8cbec0 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8", "name": "Route8", "layout": "LAYOUT_ROUTE8", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 3a1118032..2ad2abb9b 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8_WEST_ENTRANCE", "name": "Route8_WestEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index ec21a527b..fa56d8ed2 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE9", "name": "Route9", "layout": "LAYOUT_ROUTE9", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 4ba7c113d..b2ceb6810 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_CORRIDOR", "name": "SSAnne_1F_Corridor", "layout": "LAYOUT_SSANNE_1F_CORRIDOR", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index c54bbc8de..104a568ab 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM1", "name": "SSAnne_1F_Room1", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 81fcf337b..fcc3d6bf0 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM2", "name": "SSAnne_1F_Room2", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 1e8b1f145..615f4c9b1 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM3", "name": "SSAnne_1F_Room3", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 56d910b4b..c12b81c2d 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM4", "name": "SSAnne_1F_Room4", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index c32c962d9..6e86a11e8 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM5", "name": "SSAnne_1F_Room5", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 8dbbe1e1b..c8e98e62a 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM6", "name": "SSAnne_1F_Room6", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 323374027..aa2732f36 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM7", "name": "SSAnne_1F_Room7", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 6dcb6a7ee..80641f2ed 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_CORRIDOR", "name": "SSAnne_2F_Corridor", "layout": "LAYOUT_SSANNE_2F_CORRIDOR", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 68ead6a96..12871cff0 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -29,7 +29,7 @@ EventScript_160903:: @ 8160903 textcolor 0 playse SE_KAIDAN delay 5 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 1 delay 10 applymovement 1, Movement_1A75ED @@ -52,7 +52,7 @@ EventScript_160903:: @ 8160903 msgbox gUnknown_8173164 closemessage delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_1609FD compare_var_to_value VAR_0x4001, 1 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 10f3c8604..6b7950e26 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM1", "name": "SSAnne_2F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 5fe5c9ff2..66f6c2e97 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM2", "name": "SSAnne_2F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 7241e3d01..ed032b4b3 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM3", "name": "SSAnne_2F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 54ed72c44..5fee6f393 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM4", "name": "SSAnne_2F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 3512aa723..c9f3fe809 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM5", "name": "SSAnne_2F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 7b2d2666e..4f92d7599 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM6", "name": "SSAnne_2F_Room6", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index c34977686..3318b3553 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_3F_CORRIDOR", "name": "SSAnne_3F_Corridor", "layout": "LAYOUT_SSANNE_3F_CORRIDOR", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 9accdb250..1ac031188 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_CORRIDOR", "name": "SSAnne_B1F_Corridor", "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 87ea2dc4c..2db8e4478 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM1", "name": "SSAnne_B1F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 0f1d75d5f..635c1aadc 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM2", "name": "SSAnne_B1F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index bb99ece2f..caf5fb525 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM3", "name": "SSAnne_B1F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index a587f56b3..fbbf0545e 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM4", "name": "SSAnne_B1F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 0ea2a8747..f80ab4f82 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM5", "name": "SSAnne_B1F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 9870b5f09..664266e47 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_CAPTAINS_OFFICE", "name": "SSAnne_CaptainsOffice", "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 32ab8b95c..4dad097a0 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -17,7 +17,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A waitmovement 0 msgbox gUnknown_81736A6 additem ITEM_HM01, 1 - giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 msgbox gUnknown_81737D2 setflag FLAG_0x237 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index d4bf928af..bd1e16bf3 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_DECK", "name": "SSAnne_Deck", "layout": "LAYOUT_SSANNE_DECK", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 4694c1520..b0a63e5c9 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_EXTERIOR", "name": "SSAnne_Exterior", "layout": "LAYOUT_SSANNE_EXTERIOR", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index b0112c459..8b622c54a 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -18,7 +18,7 @@ SSAnne_Exterior_160859:: @ 8160859 call_if 3, EventScript_1608A1 compare_var_to_value VAR_0x8005, 7 call_if 4, EventScript_1608AC - fadenewbgm BGM_FRLG_SURF + fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene waitstate diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 968c8c15c..19e7eac4e 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_KITCHEN", "name": "SSAnne_Kitchen", "layout": "LAYOUT_SSANNE_KITCHEN", - "music": "BGM_FRLG_SS_ANNE", + "music": "MUS_SANTOAN", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 93f66a692..3173c5dae 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_BUILDING1", "name": "SafariZone_Building1", "layout": "LAYOUT_SAFARI_ZONE_BUILDING", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 178ecdc06..2aade6512 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_BUILDING2", "name": "SafariZone_Building2", "layout": "LAYOUT_SAFARI_ZONE_BUILDING", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index 768e83b94..fae8637ea 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_BUILDING3", "name": "SafariZone_Building3", "layout": "LAYOUT_SAFARI_ZONE_BUILDING", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index 0769bd7a2..a2ccec451 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_BUILDING4", "name": "SafariZone_Building4", "layout": "LAYOUT_SAFARI_ZONE_BUILDING", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 2eec6d8da..6a21b2a3e 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER", "name": "SafariZone_Center", "layout": "LAYOUT_SAFARI_ZONE_CENTER", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 23a6d3596..e9b4475cf 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST", "name": "SafariZone_East", "layout": "LAYOUT_SAFARI_ZONE_EAST", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index f69e86fd5..e02b44909 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH", "name": "SafariZone_North", "layout": "LAYOUT_SAFARI_ZONE_NORTH", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 0616c4782..7eff5e68f 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", "name": "SafariZone_SecretHouse", "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index e91ecd175..4a9558841 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST", "name": "SafariZone_West", "layout": "LAYOUT_SAFARI_ZONE_WEST", - "music": "BGM_FRLG_SAFARI_ZONE", + "music": "MUS_SHINKA", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 19715bdf9..48eba64e0 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY", "name": "SaffronCity", "layout": "LAYOUT_SAFFRON_CITY", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Classic/map.json index 22eb6ab26..0a5614975 100644 --- a/data/maps/SaffronCity_Classic/map.json +++ b/data/maps/SaffronCity_Classic/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_CLASSIC", "name": "SaffronCity_Classic", "layout": "LAYOUT_SAFFRON_CITY_CLASSIC", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index b3c1f049c..85f44168e 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_DOJO", "name": "SaffronCity_Dojo", "layout": "LAYOUT_SAFFRON_CITY_DOJO", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index aee6e8b27..24cd66c55 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_GYM", "name": "SaffronCity_Gym", "layout": "LAYOUT_SAFFRON_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index 2d2f1ad1a..ed48d983f 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -5,7 +5,7 @@ Text_19B53C:: @ 819B53C .string "It started when a spoon I\n" .string "carelessly tossed, bent.\p" .string "I dislike battling, but if you wish,\n" - .string "I will show you my powers!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" Text_19B602:: @ 819B602 .string "This loss shocks me!\n" diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 9e30f1487..287f760d8 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE1_1F", "name": "SaffronCity_House1_1F", "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index 3a1d497f9..fe34076ae 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE1_2F", "name": "SaffronCity_House1_2F", "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 1ae403616..0b87576cd 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE2", "name": "SaffronCity_House2", "layout": "LAYOUT_HOUSE5", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index 0158a1b04..f4b227795 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE3", "name": "SaffronCity_House3", "layout": "LAYOUT_HOUSE5", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 911a1d85f..1bfe45aca 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MART", "name": "SaffronCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index ddfd0e82d..118936b0e 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", "name": "SaffronCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 303a60ce7..8fdf8ac26 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", "name": "SaffronCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 83d719a54..e702db16e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "SaffronCity_PokemonTrainerFanClub", "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index c2927eef5..a40335f0d 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_1F", "name": "SeafoamIslands_1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 161ba065c..c1003895d 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B1F", "name": "SeafoamIslands_B1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index b4984b189..fdc44c9a5 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B2F", "name": "SeafoamIslands_B2F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 06815d1da..043dea721 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B3F", "name": "SeafoamIslands_B3F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 6f3a99b06..09da347d3 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B4F", "name": "SeafoamIslands_B4F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 5ec6bc28c..c0bcc1196 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -176,7 +176,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC waitmessage waitmoncry delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_0x807 special sub_807F9D8 diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 003bd5192..a227a7121 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND", "name": "SevenIsland", "layout": "LAYOUT_SEVEN_ISLAND", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index df4507662..d33245efd 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HARBOR", "name": "SevenIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index f7181d41f..d319db640 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", "name": "SevenIsland_House_Room1", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 474d071d5..131c2531f 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", "name": "SevenIsland_House_Room2", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 4d4be3485..64f56ce7f 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_MART", "name": "SevenIsland_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 9cf243db6..cac3cd8f6 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", "name": "SevenIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index e7d48f819..5952fb9b3 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", "name": "SevenIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index fe1f030fd..f6af3773a 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SeavaultCanyon_TanobyKey", "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index 566ed3ee6..b1cf1bc89 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -105,7 +105,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B EventScript_164F2E:: @ 8164F2E addvar VAR_0x4008, 1 - playse SE_RU_HYUU + playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 @@ -127,7 +127,7 @@ EventScript_164F51:: @ 8164F51 setvar VAR_0x8007, 2 special sub_80CAC28 delay 60 - playse SE_EXP + playse SE_FU_ZUZUZU waitse return diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index fbdaec45b..96721c128 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", "name": "SevenIsland_SevaultCanyon", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 6011ec09d..32435d020 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", "name": "SevenIsland_SevaultCanyon_Entrance", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index a1a85b829..3b38de1a7 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", "name": "SevenIsland_SevaultCanyon_House", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 4098a0e0d..ed5f0d95d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -5,7 +5,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock checkflag FLAG_0x002 goto_if_eq EventScript_172211 - playbgm BGM_FRLG_CHANSEY_DANCE, 0 + playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 fadedefaultbgm @@ -23,7 +23,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 compare_var_to_value VAR_FACING, 1 call_if 5, EventScript_172206 delay 30 - playbgm BGM_FRLG_CHANSEY_DANCE, 0 + playbgm MUS_P_SCHOOL, 0 applymovement 255, Movement_172231 waitmovement 0 fadedefaultbgm diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 1659d862d..46cd52796 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", "name": "SevenIsland_TanobyRuins", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 7347361dc..ddb7b332e 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", "name": "SevenIsland_TanobyRuins_DilfordChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 42e25a9bd..72183cadb 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", "name": "SevenIsland_TanobyRuins_LiptooChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index 1bdee8840..9685ccfe6 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", "name": "SevenIsland_TanobyRuins_MoneanChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index af7181502..ba84889d5 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", "name": "SevenIsland_TanobyRuins_RixyChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 58fa3d18c..d21ec2792 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", "name": "SevenIsland_TanobyRuins_ScufibChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index 90cf4bd82..fd2e1317c 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", "name": "SevenIsland_TanobyRuins_ViapoisChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index 542f8f61e..c53a81f80 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", "name": "SevenIsland_TanobyRuins_WeepthChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 3c509950e..fcf63e782 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", "name": "SevenIsland_TrainerTower", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index f894c679f..a830c85d0 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", "name": "SevenIsland_TrainerTower_1F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 1af583fc9..6fdc50198 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", "name": "SevenIsland_TrainerTower_2F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index 1ada6e08b..d697f3adb 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", "name": "SevenIsland_TrainerTower_3F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index e16cdcc95..f6b7336ee 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", "name": "SevenIsland_TrainerTower_4F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index d30f293c6..c5ce3d4c7 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", "name": "SevenIsland_TrainerTower_5F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 03436ecc9..5fc6fc1df 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", "name": "SevenIsland_TrainerTower_6F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index cc738186e..2ede0ac79 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", "name": "SevenIsland_TrainerTower_7F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index bcf7ce583..a04a282bf 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", "name": "SevenIsland_TrainerTower_8F", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json index a1130c118..fef686312 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", "name": "SevenIsland_TrainerTower_Elevator", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index d65c41577..ac93f0992 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", "name": "SevenIsland_TrainerTower_Lobby", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 5acb601dc..5515316cb 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -54,7 +54,7 @@ EventScript_1648C8:: @ 81648C8 waitmovement 0 setmetatile 17, 10, 692, 1 special DrawWholeMapView - playse SE_N + playse SE_TK_KASYA waitse setvar VAR_0x400D, 0 releaseall diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index b8f8f858b..ade5bc46c 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", "name": "SevenIsland_TrainerTower_Roof", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "music": "BGM_FRLG_TRAINER_TOWER", + "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 51dcc5ee6..bc8c5fe00 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_10F", "name": "SilphCo_10F", "layout": "LAYOUT_SILPH_CO_10F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 1d479e041..3406c6a7b 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_11F", "name": "SilphCo_11F", "layout": "LAYOUT_SILPH_CO_11F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 92dc9ebc0..3eade43f5 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -21,7 +21,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_161E6B additem ITEM_MASTER_BALL, 1 - giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB setflag FLAG_0x250 release diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 5c751aba8..d82ff755d 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_1F", "name": "SilphCo_1F", "layout": "LAYOUT_SILPH_CO_1F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 51d1ba7a6..13c6b8584 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_2F", "name": "SilphCo_2F", "layout": "LAYOUT_SILPH_CO_2F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index b900dd5dd..99ef61e01 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_3F", "name": "SilphCo_3F", "layout": "LAYOUT_SILPH_CO_3F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 04966c66f..aed1bd4a5 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_4F", "name": "SilphCo_4F", "layout": "LAYOUT_SILPH_CO_4F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index b3f512516..5582db2ca 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_5F", "name": "SilphCo_5F", "layout": "LAYOUT_SILPH_CO_5F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index c9c1b2f09..2d057a7c2 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_6F", "name": "SilphCo_6F", "layout": "LAYOUT_SILPH_CO_6F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 36f2d0ba7..e106c5ad8 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_7F", "name": "SilphCo_7F", "layout": "LAYOUT_SILPH_CO_7F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 93893b711..22fd4114c 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -39,7 +39,7 @@ EventScript_1619D3:: @ 81619D3 EventScript_1619D4:: @ 81619D4 textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 1, Movement_1A75DB waitmovement 0 applymovement 255, Movement_1A75ED @@ -60,12 +60,12 @@ EventScript_1619D4:: @ 81619D4 call_if 1, EventScript_161A96 msgbox gUnknown_8176827 closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_161AA1 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_161AAC - playse SE_FU_ZUZUZU + playse SE_TK_WARPIN fadedefaultbgm removeobject 1 waitse diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 9c23aac86..437b935dd 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_8F", "name": "SilphCo_8F", "layout": "LAYOUT_SILPH_CO_8F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 05bbe1138..026b8d83c 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_9F", "name": "SilphCo_9F", "layout": "LAYOUT_SILPH_CO_9F", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index be61c86d2..815ed916e 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_ELEVATOR", "name": "SilphCo_Elevator", "layout": "LAYOUT_SILPH_CO_ELEVATOR", - "music": "BGM_FRLG_SILPH", + "music": "MUS_SHIRUHU", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index f65e61afd..a45d77e70 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND", "name": "SixIsland", "layout": "LAYOUT_SIX_ISLAND", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index c5376d59d..b8141664e 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_ALTERING_CAVE", "name": "SixIsland_AlteringCave", "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", - "music": "BGM_FRLG_MT_EMBER", + "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index bd7bb4933..d83c3d58b 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", "name": "SixIsland_DottedHole_1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 497bde584..449f0da2d 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", "name": "SixIsland_DottedHole_B1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index c01e689f5..79cf28355 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", "name": "SixIsland_DottedHole_B2F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 97bf261ca..6c7af4456 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", "name": "SixIsland_DottedHole_B3F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index f418ee608..2490d48a7 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", "name": "SixIsland_DottedHole_B4F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index db1a1715a..0f78765b5 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", "name": "SixIsland_DottedHole_SapphireRoom", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "music": "BGM_FRLG_TANOBY_RUINS", + "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index ce372cae9..618a5dd4c 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -5,17 +5,17 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 lock faceplayer textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM + playfanfare MUS_FAN5 message Text_17BD82 waitmessage waitfanfare closemessage setobjectxyperm 2, 5, 0 addobject 2 - playse SE_FU_ZAKU + playse SE_RU_HYUU applymovement 2, Movement_16440F waitmovement 0 - playse SE_W115 + playse SE_W070 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_16430F compare_var_to_value VAR_FACING, 1 diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index abcf7f0af..bb106cb7f 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_GREEN_PATH", "name": "SixIsland_GreenPath", "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 4af0b5351..c86d93e32 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HARBOR", "name": "SixIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 4444ed8af..1e82148ef 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HOUSE", "name": "SixIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index f6e686c5f..74cf54daa 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_MART", "name": "SixIsland_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 459fc1275..a643d0dcd 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", "name": "SixIsland_OutcastIsland", "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 8d0953181..52ce32061 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_PATTERN_BUSH", "name": "SixIsland_PatternBush", "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 5a22c24ba..9b3a2b671 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", "name": "SixIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 593f9f979..769a5d86f 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -23,7 +23,7 @@ EventScript_171D97:: @ 8171D97 textcolor 0 applymovement 2, Movement_1A75ED waitmovement 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 applymovement 2, Movement_1A75DB waitmovement 0 applymovement 2, Movement_1A75DD diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index d5865a28b..2a0b353b1 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", "name": "SixIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 8e5fc1b9f..eea1088f5 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_RUIN_VALLEY", "name": "SixIsland_RuinValley", "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 2539323d8..dc5768d72 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH", "name": "SixIsland_WaterPath", "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 5a446e953..482b278be 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", "name": "SixIsland_WaterPath_House1", "layout": "LAYOUT_HOUSE4", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 915052f9f..dbe2dfc1e 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", "name": "SixIsland_WaterPath_House2", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 8e45d33fc..635f1a356 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 4d6773491..39a3688fe 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -221,7 +221,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 applymovement 5, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_167C35 @@ -234,7 +234,7 @@ EventScript_167A59:: @ 8167A59 closemessage applymovement 7, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 trainerbattle 3, 528, 0, Text_182521 @@ -244,7 +244,7 @@ EventScript_167A59:: @ 8167A59 closemessage applymovement 4, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 trainerbattle 3, 529, 0, Text_1825D4 @@ -266,7 +266,7 @@ EventScript_167A59:: @ 8167A59 call_if 1, EventScript_167C03 compare_var_to_value VAR_0x4001, 4 call_if 1, EventScript_167C1C - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 trainerbattle 3, 742, 0, Text_1826B7 diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 9bafdc69d..04ccdb273 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BERRY_FOREST", "name": "ThreeIsland_BerryForest", "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 904817c10..474a4063a 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BOND_BRIDGE", "name": "ThreeIsland_BondBridge", "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 3f22711d1..c4616ad9c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", "name": "ThreeIsland_DunsparceTunnel", "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index cd5781ee7..58cee2b93 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HARBOR", "name": "ThreeIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index b25e6eeb5..dc2b5321f 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE1", "name": "ThreeIsland_House1", "layout": "LAYOUT_THREE_ISLAND_HOUSE1", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index b8102556b..a596b88c0 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE2", "name": "ThreeIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 6f4b8c555..0ba900bc6 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE3", "name": "ThreeIsland_House3", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 277a4bdc5..c1ceda273 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE4", "name": "ThreeIsland_House4", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 264b6cbcb..b36be2276 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE5", "name": "ThreeIsland_House5", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index f8cd93f18..14e94407b 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_MART", "name": "ThreeIsland_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 603c14528..b3e593a18 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", "name": "ThreeIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 70b900e08..02fd95e39 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", "name": "ThreeIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index c40740fee..bbc809fc1 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_PORT", "name": "ThreeIsland_Port", "layout": "LAYOUT_THREE_ISLAND_PORT", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 17826d8fd..ff7b3c601 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND", "name": "TwoIsland", "layout": "LAYOUT_TWO_ISLAND", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 1661ef953..39a203e72 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK", "name": "TwoIsland_CapeBrink", "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 12c9ff372..75b7fb2eb 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", "name": "TwoIsland_CapeBrink_House", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 29fe94fc7..0fed41496 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HARBOR", "name": "TwoIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 9289eb6b1..fe6e2a80c 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HOUSE", "name": "TwoIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 1017feaef..3b0ef6e54 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", "name": "TwoIsland_JoyfulGameCorner", "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", - "music": "BGM_FRLG_GAMECORNER", + "music": "MUS_SLOT", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index f478de107..94a0e4445 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -70,7 +70,7 @@ EventScript_17145F:: @ 817145F waitse applymovement 255, Movement_17152C waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 addobject 2 applymovement 2, Movement_17152F waitmovement 0 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index f9bb96a3d..104e8fb2e 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", "name": "TwoIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 719f84889..89ef1c015 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", "name": "TwoIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 0b2af8aab..c6a7a20ef 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", "name": "UndergroundPath_EastEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 8797f8e3f..a1acbf716 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", "name": "UndergroundPath_EastWestTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "music": "BGM_FRLG_ROUTE_1", + "music": "MUS_LOAD01", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 36ce0da5c..3620937c7 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", "name": "UndergroundPath_NorthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 238b408ea..9d0408768 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", "name": "UndergroundPath_NorthSouthTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "music": "BGM_FRLG_ROUTE_1", + "music": "MUS_LOAD01", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index 5e48882a8..ef8888b06 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", "name": "UndergroundPath_SouthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 54a036c06..6791d7100 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", "name": "UndergroundPath_WestEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index edf3c52b7..ffebedc43 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_00_00", "name": "UnknownMap_00_00", "layout": "LAYOUT_UNKNOWN_MAP_00_00", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index ad1ec4084..5d40fa820 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_00_01", "name": "UnknownMap_00_01", "layout": "LAYOUT_UNKNOWN_MAP_00_01", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 76294433e..742239cd3 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_00_02", "name": "UnknownMap_00_02", "layout": "LAYOUT_UNKNOWN_MAP_00_02", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json index 05301e782..2f9141fe6 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/UnknownMap_00_03/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_00_03", "name": "UnknownMap_00_03", "layout": "LAYOUT_UNKNOWN_MAP_00_03", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index 851ad7f1d..ed9be424f 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_00_04", "name": "UnknownMap_00_04", "layout": "LAYOUT_UNKNOWN_MAP_00_04", - "music": "BGM_FRLG_UNION_ROOM", + "music": "MUS_UNION", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json index e3a542b51..25d12e137 100644 --- a/data/maps/UnknownMap_03_50/map.json +++ b/data/maps/UnknownMap_03_50/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_03_50", "name": "UnknownMap_03_50", "layout": "LAYOUT_UNKNOWN_MAP_03_50", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json index 80d857ec6..25c135de4 100644 --- a/data/maps/UnknownMap_03_51/map.json +++ b/data/maps/UnknownMap_03_51/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_03_51", "name": "UnknownMap_03_51", "layout": "LAYOUT_UNKNOWN_MAP_03_51", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json index 23b9a845d..e38359999 100644 --- a/data/maps/UnknownMap_03_52/map.json +++ b/data/maps/UnknownMap_03_52/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_03_52", "name": "UnknownMap_03_52", "layout": "LAYOUT_UNKNOWN_MAP_03_52", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json index f92091f77..e3001e6be 100644 --- a/data/maps/UnknownMap_03_53/map.json +++ b/data/maps/UnknownMap_03_53/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_03_53", "name": "UnknownMap_03_53", "layout": "LAYOUT_UNKNOWN_MAP_03_53", - "music": "BGM_FRLG_SEVII_ISLANDS", + "music": "MUS_NANASHIMA", "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index 5d21e06d1..7bb76e956 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_18_01", "name": "UnknownMap_18_01", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index afa2d0b7a..60ba28d54 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_27_00", "name": "UnusedHouse_27_00", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 34ef0104b..db312a5a9 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_29_00", "name": "UnusedHouse_29_00", "layout": "LAYOUT_HOUSE2", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 3445b9f56..0bd404adb 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_31_05", "name": "UnusedHouse_31_05", "layout": "LAYOUT_HOUSE4", - "music": "BGM_FRLG_ISLAND_SIX", + "music": "MUS_NANA67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index d041e9157..88387daef 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY", "name": "VermilionCity", "layout": "LAYOUT_VERMILION_CITY", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 9545fed01..dfb904da2 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_GYM", "name": "VermilionCity_Gym", "layout": "LAYOUT_VERMILION_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index bd49a6955..36430c676 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -183,7 +183,7 @@ EventScript_16B8CB:: @ 816B8CB closemessage call EventScript_16B717 special DrawWholeMapView - playse SE_FU_ZAKU2 + playse SE_KI_GASYAN waitse setflag FLAG_0x264 releaseall diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index 6d05aaf99..b0cff583a 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -7,7 +7,7 @@ Text_194BA4:: @ 8194BA4 .string "saved me during the war!\p" .string "They zapped my enemies into\n" .string "paralysis!\p" - .string "The same as I'll do to you!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$" gUnknown_8194C8E:: @ 8194C8E .string "A little word of advice, kid!\p" diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 73b782e11..f83e884a9 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE1", "name": "VermilionCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_CERULEAN_CITY", + "music": "MUS_HANADA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index a4daf98d6..980e3eae8 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE2", "name": "VermilionCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index da5d4b82a..4ef4347b3 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE3", "name": "VermilionCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 2dcf37084..519227231 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_MART", "name": "VermilionCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 47d4a391e..750104631 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", "name": "VermilionCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 5d077ec8f..7c0a45d41 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", "name": "VermilionCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 2f9255233..4d5c86771 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", "name": "VermilionCity_PokemonFanClub", "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", - "music": "BGM_FRLG_VERMILION_CITY", + "music": "MUS_KUCHIBA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 60d983af0..fc1625e39 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -25,7 +25,7 @@ EventScript_16B4B1:: @ 816B4B1 goto_if_eq EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 - giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C release end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index a62dd427d..f509d6232 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 656bd8e6c..1406ef4e5 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -23,7 +23,7 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33 goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 - playse SE_MU_PACHI + playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 5 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 058247ece..1591bf1ee 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_2F", "name": "VictoryRoad_2F", "layout": "LAYOUT_VICTORY_ROAD_2F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index b35ee7821..ba4d835f4 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -25,7 +25,7 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 - playse SE_MU_PACHI + playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 11 @@ -43,7 +43,7 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006 goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 - playse SE_MU_PACHI + playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 12 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 5ba23ad2e..32eb36734 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_3F", "name": "VictoryRoad_3F", "layout": "LAYOUT_VICTORY_ROAD_3F", - "music": "BGM_FRLG_MT_MOON", + "music": "MUS_OTSUKIMI", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 17331cee4..1a4c42953 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -18,7 +18,7 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 - playse SE_MU_PACHI + playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 7 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 2c47e786f..de9ff3465 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY", "name": "ViridianCity", "layout": "LAYOUT_VIRIDIAN_CITY", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 6b9738c4d..f862217e0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_GYM", "name": "ViridianCity_Gym", "layout": "LAYOUT_VIRIDIAN_CITY_GYM", - "music": "BGM_FRLG_GYM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 608d52755..7372bd6d3 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -7,7 +7,7 @@ Text_18F352:: @ 818F352 .string "So be it.\l" .string "This time, I'm not holding back!\p" .string "Once more, you shall face\n" - .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$" + .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$" Text_18F43F:: @ 818F43F .string "Ha!\n" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index ef18aa4c4..628b66dd0 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE1", "name": "ViridianCity_House1", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 5f6b02a03..3b3bc76a0 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE2", "name": "ViridianCity_House2", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "music": "BGM_FRLG_VIRIDIAN_CITY", + "music": "MUS_NIBI", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 3915e053d..122ef65d3 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_MART", "name": "ViridianCity_Mart", "layout": "LAYOUT_MART", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 44d9437ea..02ed8b57c 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -30,7 +30,7 @@ EventScript_16A205:: @ 816A205 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 - giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, BGM_FRLG_ME_KEYITEM + giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index a63b5d733..0d2f95957 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", "name": "ViridianCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 5d66d7096..16c5033d1 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", "name": "ViridianCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "BGM_FRLG_POKEMON_CENTER", + "music": "MUS_POKECEN", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index ca91c7017..89d9a9f03 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_FOREST", "name": "ViridianForest", "layout": "LAYOUT_VIRIDIAN_FOREST", - "music": "BGM_FRLG_VIRIDIAN_FOREST", + "music": "MUS_T_MORI", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_CLOUDY", diff --git a/data/strings.s b/data/strings.s index e43a37050..63c08bbab 100644 --- a/data/strings.s +++ b/data/strings.s @@ -875,7 +875,7 @@ gUnknown_8416EA4:: @ 8416EA4 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" gUnknown_8416EC6:: @ 8416EC6 - .string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_TRACK_MOVE}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}$" + .string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}$" gUnknown_8416F10:: @ 8416F10 .string "{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" @@ -3974,7 +3974,7 @@ gUnknown_841E481:: @ 841E481 .string "Stop learning {STR_VAR_2}?$" gUnknown_841E493:: @ 841E493 - .string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_TRACK_MOVE}Poof!\p$" + .string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p$" gUnknown_841E4C0:: @ 841E4C0 .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd‥\p{STR_VAR_1}\nlearned {STR_VAR_2}.$" diff --git a/include/constants/songs.h b/include/constants/songs.h index 3c0e72757..f1868ca2a 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -4,7 +4,7 @@ #define MUS_DUMMY 0 #define SE_STOP 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 @@ -27,234 +27,237 @@ #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_MU_PACHI 35 -#define SE_TK_KASYA 36 -#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_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_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_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_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_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_CASHIER 248 -#define SE_SHIP_HORN 249 -#define SE_HELP_OPEN 250 -#define SE_HELP_CLOSE 251 -#define SE_HELP_ERR 252 +#define SE_SEIKAI 25 +#define SE_HAZURE 26 +#define SE_EXP 27 +#define SE_JITE_PYOKO 28 +#define SE_MU_PACHI 29 +#define SE_TK_KASYA 30 +#define SE_FU_ZAKU 31 +#define SE_FU_ZAKU2 32 +#define SE_FU_ZUZUZU 33 +#define SE_RU_GASHIN 34 +#define SE_RU_GASYAN 35 +#define SE_RU_BARI 36 +#define SE_RU_HYUU 37 +#define SE_KI_GASYAN 38 +#define SE_TK_WARPIN 39 +#define SE_TK_WARPOUT 40 +#define SE_TU_SAA 41 +#define SE_HI_TURUN 42 +#define SE_TRACK_MOVE 43 +#define SE_TRACK_STOP 44 +#define SE_TRACK_HAIKI 45 +#define SE_TRACK_DOOR 46 +#define SE_MOTER 47 +#define SE_SAVE 48 +#define SE_KON 49 +#define SE_KON2 50 +#define SE_KON3 51 +#define SE_KON4 52 +#define SE_SUIKOMU 53 +#define SE_NAGERU 54 +#define SE_TOY_C 55 +#define SE_TOY_D 56 +#define SE_TOY_E 57 +#define SE_TOY_F 58 +#define SE_TOY_G 59 +#define SE_TOY_A 60 +#define SE_TOY_B 61 +#define SE_TOY_C1 62 +#define SE_MIZU 63 +#define SE_HASHI 64 +#define SE_DAUGI 65 +#define SE_PINPON 66 +#define SE_FUUSEN1 67 +#define SE_FUUSEN2 68 +#define SE_FUUSEN3 69 +#define SE_TOY_KABE 70 +#define SE_TOY_DANGO 71 +#define SE_DOKU 72 +#define SE_ESUKA 73 +#define SE_T_AME 74 +#define SE_T_AME_E 75 +#define SE_T_OOAME 76 +#define SE_T_OOAME_E 77 +#define SE_T_KOAME 78 +#define SE_T_KOAME_E 79 +#define SE_T_KAMI 80 +#define SE_T_KAMI2 81 +#define SE_ELEBETA 82 +#define SE_HINSI 83 +#define SE_EXPMAX 84 +#define SE_TAMAKORO 85 +#define SE_TAMAKORO_E 86 +#define SE_BASABASA 87 +#define SE_REGI 88 +#define SE_C_GAJI 89 +#define SE_C_MAKU_U 90 +#define SE_C_MAKU_D 91 +#define SE_C_PASI 92 +#define SE_C_SYU 93 +#define SE_C_PIKON 94 +#define SE_REAPOKE 95 +#define SE_OP_BASYU 96 +#define SE_BT_START 97 +#define SE_DENDOU 98 +#define SE_JIHANKI 99 +#define SE_TAMA 100 +#define SE_Z_SCROLL 101 +#define SE_Z_PAGE 102 +#define SE_PN_ON 103 +#define SE_PN_OFF 104 +#define SE_Z_SEARCH 105 +#define SE_TAMAGO 106 +#define SE_TB_START 107 +#define SE_TB_KON 108 +#define SE_TB_KARA 109 +#define SE_BIDORO 110 +#define SE_W085 111 +#define SE_W085B 112 +#define SE_W231 113 +#define SE_W171 114 +#define SE_W233 115 +#define SE_W233B 116 +#define SE_W145 117 +#define SE_W145B 118 +#define SE_W145C 119 +#define SE_W240 120 +#define SE_W015 121 +#define SE_W081 122 +#define SE_W081B 123 +#define SE_W088 124 +#define SE_W016 125 +#define SE_W016B 126 +#define SE_W003 127 +#define SE_W104 128 +#define SE_W013 129 +#define SE_W196 130 +#define SE_W086 131 +#define SE_W004 132 +#define SE_W025 133 +#define SE_W025B 134 +#define SE_W152 135 +#define SE_W026 136 +#define SE_W172 137 +#define SE_W172B 138 +#define SE_W053 139 +#define SE_W007 140 +#define SE_W092 141 +#define SE_W221 142 +#define SE_W221B 143 +#define SE_W052 144 +#define SE_W036 145 +#define SE_W059 146 +#define SE_W059B 147 +#define SE_W010 148 +#define SE_W011 149 +#define SE_W017 150 +#define SE_W019 151 +#define SE_W028 152 +#define SE_W013B 153 +#define SE_W044 154 +#define SE_W029 155 +#define SE_W057 156 +#define SE_W056 157 +#define SE_W250 158 +#define SE_W030 159 +#define SE_W039 160 +#define SE_W054 161 +#define SE_W077 162 +#define SE_W020 163 +#define SE_W082 164 +#define SE_W047 165 +#define SE_W195 166 +#define SE_W006 167 +#define SE_W091 168 +#define SE_W146 169 +#define SE_W120 170 +#define SE_W153 171 +#define SE_W071B 172 +#define SE_W071 173 +#define SE_W103 174 +#define SE_W062 175 +#define SE_W062B 176 +#define SE_W048 177 +#define SE_W187 178 +#define SE_W118 179 +#define SE_W155 180 +#define SE_W122 181 +#define SE_W060 182 +#define SE_W185 183 +#define SE_W014 184 +#define SE_W043 185 +#define SE_W207 186 +#define SE_W207B 187 +#define SE_W215 188 +#define SE_W109 189 +#define SE_W173 190 +#define SE_W280 191 +#define SE_W202 192 +#define SE_W060B 193 +#define SE_W076 194 +#define SE_W080 195 +#define SE_W100 196 +#define SE_W107 197 +#define SE_W166 198 +#define SE_W129 199 +#define SE_W115 200 +#define SE_W112 201 +#define SE_W197 202 +#define SE_W199 203 +#define SE_W236 204 +#define SE_W204 205 +#define SE_W268 206 +#define SE_W070 207 +#define SE_W063 208 +#define SE_W127 209 +#define SE_W179 210 +#define SE_W151 211 +#define SE_W201 212 +#define SE_W161 213 +#define SE_W161B 214 +#define SE_W227 215 +#define SE_W227B 216 +#define SE_W226 217 +#define SE_W208 218 +#define SE_W213 219 +#define SE_W213B 220 +#define SE_W234 221 +#define SE_W260 222 +#define SE_W328 223 +#define SE_W320 224 +#define SE_W255 225 +#define SE_W291 226 +#define SE_W089 227 +#define SE_W239 228 +#define SE_W230 229 +#define SE_W281 230 +#define SE_W327 231 +#define SE_W287 232 +#define SE_W257 233 +#define SE_W253 234 +#define SE_W258 235 +#define SE_W322 236 +#define SE_W298 237 +#define SE_W287B 238 +#define SE_W114 239 +#define SE_W063B 240 +#define MUS_W_DOOR 241 +#define SE_CARD1 242 +#define SE_CARD2 243 +#define SE_CARD3 244 +#define SE_BAG1 245 +#define SE_BAG2 246 +#define SE_GETTING 247 +#define SE_SHOP 248 +#define SE_KITEKI 249 +#define SE_HELP_OP 250 +#define SE_HELP_CL 251 +#define SE_HELP_NG 252 +#define SE_DEOMOV 253 +#define SE_EXCELLENT 254 +#define SE_NAWAMISS 255 #define MUS_ME_ASA 256 #define MUS_FANFA1 257 @@ -264,224 +267,88 @@ #define MUS_ME_WAZA 261 #define MUS_ME_KINOMI 262 #define MUS_ME_SHINKA 263 -#define BGM_FRLG_SAFARI_ZONE 264 -#define MUS_SHINKA BGM_FRLG_SAFARI_ZONE -#define BGM_FRLG_CHANSEY_DANCE 267 +#define MUS_SHINKA 264 +#define MUS_BATTLE32 265 +#define MUS_BATTLE20 266 +#define MUS_P_SCHOOL 267 #define MUS_ME_B_BIG 268 #define MUS_ME_B_SMALL 269 #define MUS_ME_WASURE 270 #define MUS_ME_ZANNEN 271 -#define BGM_FRLG_FOLLOW_ME 272 -#define BGM_FRLG_GAMECORNER 273 -#define BGM_FRLG_ROCKET_HIDEOUT 274 -#define BGM_FRLG_GYM 275 -#define BGM_FRLG_JIGGLYPUFF 276 -#define BGM_FRLG_OPENING 277 -#define BGM_FRLG_TITLE 278 -#define BGM_FRLG_CINNABAR_ISLAND 279 -#define BGM_FRLG_LAVENDER_TOWN 280 -#define BGM_FRLG_HEALING_TEST 281 -#define BGM_FRLG_BICYCLE 282 -#define BGM_FRLG_SUSPICIOUS_EYE 283 -#define BGM_FRLG_GIRL_EYE 284 -#define BGM_FRLG_BOY_EYE 285 -#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 286 -#define BGM_FRLG_VIRIDIAN_FOREST 287 -#define BGM_FRLG_MT_MOON 288 -#define BGM_FRLG_POKEMON_MANSION 289 -#define BGM_FRLG_CREDITS 290 -#define BGM_FRLG_ROUTE_1 291 -#define BGM_FRLG_ROUTE_24 292 -#define BGM_FRLG_ROUTE_3 293 -#define BGM_FRLG_ROUTE_11 294 -#define BGM_FRLG_INDIGO_PLATEAU 295 -#define BGM_FRLG_BATTLE_LEADER 296 -#define BGM_FRLG_BATTLE_TRAINER 297 -#define BGM_FRLG_BATTLE_WILD_POKEMON 298 -#define BGM_FRLG_BATTLE_CHAMPION 299 -#define BGM_FRLG_PALLET_TOWN 300 -#define BGM_FRLG_OAK_LAB 301 -#define BGM_FRLG_PROF_OAK 302 -#define BGM_FRLG_POKEMON_CENTER 303 -#define BGM_FRLG_SS_ANNE 304 -#define BGM_FRLG_SURF 305 -#define BGM_FRLG_POKEMON_TOWER 306 -#define BGM_FRLG_SILPH 307 -#define BGM_FRLG_CERULEAN_CITY 308 -#define BGM_FRLG_CELADON_CITY 309 -#define BGM_FRLG_KACHI_TRAINER 310 -#define BGM_FRLG_KACHI_WILD_POKEMON 311 -#define BGM_FRLG_KACHI_LEADER 312 -#define BGM_FRLG_VERMILION_CITY 313 -#define BGM_FRLG_VIRIDIAN_CITY 314 -#define BGM_FRLG_RIVAL 315 -#define BGM_FRLG_RIVAL_POSTBATTLE 316 -#define BGM_FRLG_ME_POKEDEX_EVAL 317 -#define BGM_FRLG_ME_KEYITEM 318 -#define BGM_FRLG_FANFA_POKEMON_CAUGHT 319 -#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 320 -#define BGM_FRLG_GAMEFREAK_LOGO 321 -#define BGM_FRLG_CAUGHT_POKEMON 322 -#define BGM_FRLG_GAME_EXPLANATION_START 323 -#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 324 -#define BGM_FRLG_GAME_EXPLANATION_END 325 -#define BGM_FRLG_POKEMON_JUMP 326 -#define BGM_FRLG_UNION_ROOM 327 -#define BGM_FRLG_POKEMON_NETWORK_CENTER 328 -#define BGM_FRLG_MYSTERY_GIFT 329 -#define BGM_FRLG_DODRIO_BERRY_PICK 330 -#define BGM_FRLG_MT_EMBER 331 -#define BGM_FRLG_TEACHY_TV_EPISODE 332 -#define BGM_FRLG_SEVII_ISLANDS 333 -#define BGM_FRLG_TANOBY_RUINS 334 -#define BGM_FRLG_ISLAND_ONE 335 -#define BGM_FRLG_ISLAND_FOUR 336 -#define BGM_FRLG_ISLAND_SIX 337 -#define BGM_FRLG_FLUTE 338 -#define BGM_FRLG_BATTLE_DEOXYS 339 -#define BGM_FRLG_BATTLE_MEWTWO 340 -#define BGM_FRLG_BATTLE_LEGENDARY 341 -#define BGM_FRLG_LEADER_EYE 342 -#define BGM_FRLG_DEOXYS_EYE 343 -#define BGM_FRLG_TRAINER_TOWER 344 -#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 345 -#define BGM_FRLG_TEACHY_TV 346 - -#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_ROUTE_118 0x7FFF // What is this for? +#define MUS_ANNAI 272 +#define MUS_SLOT 273 +#define MUS_AJITO 274 +#define MUS_GYM 275 +#define MUS_PURIN 276 +#define MUS_DEMO 277 +#define MUS_TITLE 278 +#define MUS_GUREN 279 +#define MUS_SHION 280 +#define MUS_KAIHUKU 281 +#define MUS_CYCLING 282 +#define MUS_ROCKET 283 +#define MUS_SHOUJO 284 +#define MUS_SHOUNEN 285 +#define MUS_DENDOU 286 +#define MUS_T_MORI 287 +#define MUS_OTSUKIMI 288 +#define MUS_POKEYASHI 289 +#define MUS_ENDING 290 +#define MUS_LOAD01 291 +#define MUS_OPENING 292 +#define MUS_LOAD02 293 +#define MUS_LOAD03 294 +#define MUS_CHAMP_R 295 +#define MUS_VS_GYM 296 +#define MUS_VS_TORE 297 +#define MUS_VS_YASEI 298 +#define MUS_VS_LAST 299 +#define MUS_MASARA 300 +#define MUS_KENKYU 301 +#define MUS_OHKIDO 302 +#define MUS_POKECEN 303 +#define MUS_SANTOAN 304 +#define MUS_NAMINORI 305 +#define MUS_P_TOWER 306 +#define MUS_SHIRUHU 307 +#define MUS_HANADA 308 +#define MUS_TAMAMUSI 309 +#define MUS_WIN_TRE 310 +#define MUS_WIN_YASEI 311 +#define MUS_WIN_GYM 312 +#define MUS_KUCHIBA 313 +#define MUS_NIBI 314 +#define MUS_RIVAL1 315 +#define MUS_RIVAL2 316 +#define MUS_FAN2 317 +#define MUS_FAN5 318 +#define MUS_FAN6 319 +#define MUS_ME_PHOTO 320 +#define MUS_TITLEROG 321 +#define MUS_GET_YASEI 322 +#define MUS_SOUSA 323 +#define MUS_SEKAIKAN 324 +#define MUS_SEIBETU 325 +#define MUS_JUMP 326 +#define MUS_UNION 327 +#define MUS_NETWORK 328 +#define MUS_OKURIMONO 329 +#define MUS_KINOMIKUI 330 +#define MUS_NANADUNGEON 331 +#define MUS_OSHIE_TV 332 +#define MUS_NANASHIMA 333 +#define MUS_NANAISEKI 334 +#define MUS_NANA123 335 +#define MUS_NANA45 336 +#define MUS_NANA67 337 +#define MUS_POKEFUE 338 +#define MUS_VS_DEO 339 +#define MUS_VS_MYU2 340 +#define MUS_VS_DEN 341 +#define MUS_EXEYE 342 +#define MUS_DEOEYE 343 +#define MUS_T_TOWER 344 +#define MUS_SLOWMASARA 345 +#define MUS_TVNOIZE 346 #endif // GUARD_CONSTANTS_SONGS_H diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index b0cd92c2e..0d827c8db 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -807,7 +807,7 @@ static void sub_802F610(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8011A1C); @@ -816,7 +816,7 @@ static void sub_802F610(void) } else if (IsLinkTaskFinished()) { - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8011A1C); @@ -838,7 +838,7 @@ void sub_802F6A8(void) } else { - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -1087,7 +1087,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId) exp -= currLvlExp; expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp; SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp); - PlaySE(SE_U); + PlaySE(SE_EXP); gTasks[taskId].func = sub_80300F4; } @@ -1113,7 +1113,7 @@ static void sub_80300F4(u8 taskId) u16 species; s32 expOnNextLvl; - m4aSongNumStop(SE_U); + m4aSongNumStop(SE_EXP); level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL); currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP); species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES); @@ -1227,7 +1227,7 @@ static void sub_80303A8(u8 taskId) ++data[15]; break; case 2: - PlaySE(SE_T_KAMI2); + PlaySE(SE_REGI); if (IsMonGettingExpSentOut()) sub_811E5B8(sprite->pos1.x + sprite->pos2.x, sprite->pos1.y + sprite->pos2.y, diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a47baea99..d2e728d0c 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -820,7 +820,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong) { if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - PlaySE(SE_T_OOAME); + PlaySE(SE_HINSI); gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1; } } @@ -828,9 +828,9 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) { gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0; if (!IsDoubleBattle()) - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); else if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); } } @@ -841,7 +841,7 @@ void BattleStopLowHpSound(void) gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0; if (IsDoubleBattle()) gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); } // not used diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f84ff4d4a..ecc8e3d36 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3165,7 +3165,7 @@ static void atk23_getexp(void) && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(BGM_FRLG_KACHI_WILD_POKEMON); + PlayBGM(MUS_WIN_YASEI); ++gBattleStruct->wildVictorySong; } if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) diff --git a/src/battle_transition.c b/src/battle_transition.c index 9a04218de..d391b3ed4 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -2756,7 +2756,7 @@ static bool8 BT_Phase2Mugshot_StartSpriteSlide(struct Task *task) BT_SetSpriteAsOpponentOrPlayer(task->tOpponentSpriteId, FALSE); BT_SetSpriteAsOpponentOrPlayer(task->tPlayerSpriteId, TRUE); BT_StartSpriteSlide(task->tOpponentSpriteId); - PlaySE(SE_C_MAKU_U); + PlaySE(SE_BT_START); ++sTransitionStructPtr->vblankDma; return FALSE; } diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 525249514..f6b976ba3 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -704,7 +704,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen { if (onInit != TRUE) { - PlaySE(SE_W287B); + PlaySE(SE_BAG1); StartBerryPouchSpriteWobbleAnim(); } DestroyItemMenuIcon(sResources->itemMenuIconId ^ 1); @@ -1381,7 +1381,7 @@ static void Task_SellYes(u8 taskId) static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId) { s16 * data = gTasks[taskId].data; - PlaySE(SE_CASHIER); + PlaySE(SE_SHOP); RemoveBagItem(gSpecialVar_ItemId, data[8]); AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]); sub_809C09C(gSpecialVar_ItemId, data[8], 2); diff --git a/src/daycare.c b/src/daycare.c index 1690953ee..837a2c4e6 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -2142,7 +2142,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_JIHANKI); + PlaySE(SE_TAMAGO); sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; diff --git a/src/fame_checker.c b/src/fame_checker.c index 31bd11b55..0278fda18 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -448,7 +448,7 @@ void UseFameChecker(MainCallback savedCallback) sFameCheckerData->listMenuTopIdx2 = 0; sFameCheckerData->listMenuDrawnSelIdx = 0; sFameCheckerData->viewingFlavorText = FALSE; - PlaySE(SE_W202); + PlaySE(SE_W129); SetMainCallback2(MainCB2_LoadFameChecker); } @@ -559,11 +559,11 @@ static void Task_TopMenuHandleInput(u8 taskId) cursorPos = FameCheckerGetCursorY(); if (TryExitPickMode(taskId) == TRUE) { - PlaySE(SE_W100); + PlaySE(SE_W199); } else if (cursorPos != sFameCheckerData->numUnlockedPersons - 1) // anything but CANCEL { - PlaySE(SE_W100); + PlaySE(SE_W199); FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); UpdateInfoBoxTilemap(2, 4); @@ -748,7 +748,7 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy) { u8 i; s16 *data = gTasks[taskId].data; - PlaySE(SE_W155); + PlaySE(SE_W207B); gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) @@ -826,7 +826,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode) static void Task_StartToCloseFameChecker(u8 taskId) { - PlaySE(SE_W202); + PlaySE(SE_W129); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker; } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 2ed3b80b9..62254a559 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -305,7 +305,7 @@ static void sub_807DF94(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); sub_8111CF0(); - PlaySE(SE_RU_GASHIN); + PlaySE(SE_TK_WARPOUT); CreateTask(sub_807E31C, 10); ScriptContext2_Enable(); } @@ -713,7 +713,7 @@ static void sub_807E784(u8 taskId) case 0: player_bitmagic(); ScriptContext2_Enable(); - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_TK_WARPIN); sub_805DAB0(); task->data[0]++; break; diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index 98f54b4d4..d117e0c9b 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -29,7 +29,7 @@ static void Task_FieldPoisonEffect(u8 taskId) void FldEffPoison_Start(void) { - PlaySE(SE_DAUGI); + PlaySE(SE_DOKU); CreateTask(Task_FieldPoisonEffect, 80); } diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 517f3479a..56a607fff 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -131,7 +131,7 @@ bool8 FldEff_UseRockSmash(void) static void sub_80C9A60(void) { - PlaySE(SE_W145); + PlaySE(SE_W088); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); EnableBothScriptContexts(); } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index aca56ef4c..114bf0b57 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -51,7 +51,7 @@ static void StartSweetScentFieldEffect(void) { u8 taskId; - PlaySE(SE_W260); + PlaySE(SE_W230); gUnknown_203AAB0 = (u8 *)Alloc(0x400); CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100); CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); diff --git a/src/help_system.c b/src/help_system.c index 3ebbcb9ec..4a4d927c5 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -59,12 +59,12 @@ u8 RunHelpSystemCallback(void) { if (!sub_812B45C() || !gHelpSystemEnabled) { - PlaySE(SE_HELP_ERR); + PlaySE(SE_HELP_NG); return 0; } m4aMPlayStop(&gMPlayInfo_SE1); m4aMPlayStop(&gMPlayInfo_SE2); - PlaySE(SE_HELP_OPEN); + PlaySE(SE_HELP_OP); if (!gUnknown_203F174) m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80); SaveCallbacks(); @@ -112,7 +112,7 @@ u8 RunHelpSystemCallback(void) case 5: if (!sub_812BB9C(&gHelpSystemListMenu, gHelpSystemListMenuItems)) { - PlaySE(SE_HELP_CLOSE); + PlaySE(SE_HELP_CL); sVideoState.state = 6; } break; diff --git a/src/intro.c b/src/intro.c index c15f40dd3..e2432b6a2 100644 --- a/src/intro.c +++ b/src/intro.c @@ -738,7 +738,7 @@ static void sub_80ECC3C(struct IntroSequenceData * this) switch (this->field_0004) { case 0: - PlaySE(BGM_FRLG_GAMEFREAK_LOGO); + PlaySE(MUS_TITLEROG); sub_80EDC40(); this->field_0012 = 0; this->field_0004++; @@ -907,7 +907,7 @@ static void sub_80ECEA4(struct IntroSequenceData * this) case 3: if (!gPaletteFade.active) { - m4aSongNumStart(BGM_FRLG_OPENING); + m4aSongNumStart(MUS_DEMO); this->field_0012 = 0; this->field_0004++; } diff --git a/src/item_pc.c b/src/item_pc.c index 24f6afed2..8569844b9 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -379,7 +379,7 @@ static bool8 ItemPc_DoGfxSetup(void) { sub_80A0A48(0, 0, 0); ItemPc_SetInitializedFlag(1); - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } gMain.state++; break; diff --git a/src/item_use.c b/src/item_use.c index c472960bd..f8a99cb1d 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -496,7 +496,7 @@ void FieldUseFunc_SuperRepel(u8 taskId) { if (VarGet(VAR_REPEL_STEP_COUNT) == 0) { - PlaySE(SE_RU_GASYAN); + PlaySE(SE_TU_SAA); gTasks[taskId].func = sub_80A19E8; } else @@ -551,7 +551,7 @@ void sub_80A1B48(u8 taskId) { if (++gTasks[taskId].data[8] > 7) { - PlaySE(SE_PN_ON); + PlaySE(SE_BIDORO); DisplayItemMessageInBag(taskId, 2, gStringVar4, sub_810A1F8); } } diff --git a/src/itemfinder.c b/src/itemfinder.c index 4e723ac03..e6448a166 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -170,7 +170,7 @@ static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId) } else { - PlaySE(SE_TOY_F); + PlaySE(SE_DAUGI); CreateArrowSprite(tDingNum, direction); tDingNum++; tNumDingsRemaining--; @@ -191,7 +191,7 @@ static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId) } else { - PlaySE(SE_TOY_F); + PlaySE(SE_DAUGI); tStartSpriteId = CreateStarSprite(); tDingNum++; tNumDingsRemaining--; diff --git a/src/mevent.c b/src/mevent.c index a7115d2d4..f1c9d8a4c 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -192,7 +192,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) case 2: if (GetLinkPlayerCount_2() == 2) { - PlaySE(SE_TOY_G); + PlaySE(SE_PINPON); CheckShouldAdvanceLinkState(); *r5 = 0; *r4 = 3; diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 9c050810e..395c4e374 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -428,7 +428,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader) case 3: ShowBg(0); ShowBg(3); - PlayBGM(BGM_FRLG_MYSTERY_GIFT); + PlayBGM(MUS_OKURIMONO); SetVBlankCallback(vblankcb_mystery_gift_e_reader_run); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); return TRUE; diff --git a/src/oak_speech.c b/src/oak_speech.c index 04b66f528..d3b8b8ff0 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -561,7 +561,7 @@ static void Task_OaksSpeech1(u8 taskId) ShowBg(0); ShowBg(1); SetVBlankCallback(VBlankCB_NewGameOaksSpeech); - PlayBGM(BGM_FRLG_GAME_EXPLANATION_START); + PlayBGM(MUS_SOUSA); gTasks[taskId].func = Task_OaksSpeech2; gMain.state = 0; return; @@ -715,7 +715,7 @@ static void Task_OakSpeech6(u8 taskId) data[3]--; else { - PlayBGM(BGM_FRLG_GAME_EXPLANATION_MIDDLE); + PlayBGM(MUS_SEKAIKAN); ClearTopBarWindow(); TopBarWindowPrintString(gText_ABUTTONNext, 0, 1); sOakSpeechResources->unk_0008 = MallocAndDecompress(sNewGameAdventureIntroTilemap, &sp14); @@ -817,7 +817,7 @@ static void Task_OakSpeech7(u8 taskId) break; case 4: sub_8006398(gTasks[taskId].data[5]); - PlayBGM(BGM_FRLG_GAME_EXPLANATION_END); + PlayBGM(MUS_SEIBETU); data[15] = 24; gMain.state++; break; @@ -876,7 +876,7 @@ static void Task_OakSpeech9(u8 taskId) CreateNidoranFSprite(taskId); LoadOaksSpeechTrainerPic(3, 0); CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1); - PlayBGM(BGM_FRLG_ROUTE_24); + PlayBGM(MUS_OPENING); BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK); data[3] = 80; ShowBg(2); @@ -1409,7 +1409,7 @@ static void Task_OakSpeech39(u8 taskId) if (sOakSpeechResources->unk_0012 % 20 == 0) { if (sOakSpeechResources->unk_0012 == 40) - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_TK_WARPIN); r0 = data[2]; data[2] -= 32; x = sub_80D8B90(r0 - 8); diff --git a/src/slot_machine.c b/src/slot_machine.c index 28292902f..3bfbbb08b 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -734,7 +734,7 @@ static void MainTask_SlotsGameLoop(u8 taskId) { sSlotMachineState->bet++; TakeCoins(1); - PlaySE(SE_T_KAMI2); + PlaySE(SE_REGI); sub_8141148(8, 0); sub_8141148(2, 1); data[0] = 1; @@ -752,7 +752,7 @@ static void MainTask_SlotsGameLoop(u8 taskId) sSlotMachineState->bet += GetCoins(); SetCoins(0); } - PlaySE(SE_T_KAMI2); + PlaySE(SE_REGI); sub_8141148(8, 0); sub_8141148(2, 1); data[0] = 1; diff --git a/src/sound.c b/src/sound.c index 41b9f5b7d..510db800f 100644 --- a/src/sound.c +++ b/src/sound.c @@ -53,9 +53,9 @@ static const struct Fanfare sFanfares[] = { { MUS_ME_B_BIG, 250 }, { MUS_ME_B_SMALL, 150 }, { MUS_ME_ZANNEN, 160 }, - { BGM_FRLG_FLUTE, 450 }, - { BGM_FRLG_ME_KEYITEM, 170 }, - { BGM_FRLG_ME_POKEDEX_EVAL, 196 } + { MUS_POKEFUE, 450 }, + { MUS_FAN5, 170 }, + { MUS_FAN2, 196 } }; extern u16 SpeciesToCryId(u16); diff --git a/src/ss_anne.c b/src/ss_anne.c index f59f17a76..19c3c8e08 100644 --- a/src/ss_anne.c +++ b/src/ss_anne.c @@ -83,7 +83,7 @@ void Special_SSAnneDepartureCutscene(void) { u8 taskId; - PlaySE(SE_SHIP_HORN); + PlaySE(SE_KITEKI); taskId = CreateTask(Task_SSAnneInit, 8); gTasks[taskId].data[0] = 50; } @@ -118,7 +118,7 @@ static void Task_SSAnneRun(u8 taskId) boatObject = &gMapObjects[mapObjectId]; if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120) { - PlaySE(SE_SHIP_HORN); + PlaySE(SE_KITEKI); gTasks[taskId].func = Task_SSAnneFinish; } else diff --git a/src/teachy_tv.c b/src/teachy_tv.c index fa687fbef..18da0997c 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -503,7 +503,7 @@ static void TeachyTvMainCallback(void) gTasks[taskId].data[0] = TeachyTvSetupWindow(); gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam(); TeachyTvSetupScrollIndicatorArrowPair(); - PlayNewMapMusic(BGM_FRLG_TEACHY_TV); + PlayNewMapMusic(MUS_TVNOIZE); TeachyTvSetWindowRegs(); } ScheduleBgCopyTilemapToVram(0); @@ -779,7 +779,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId) ScheduleBgCopyTilemapToVram(2); data[2] = 0; ++data[3]; - PlayNewMapMusic(BGM_FRLG_FOLLOW_ME); + PlayNewMapMusic(MUS_ANNAI); } } @@ -1060,7 +1060,7 @@ static void TTVcmd_End(u8 taskId) { s16 *data = gTasks[taskId].data; if (data[2] == 0) - PlayNewMapMusic(BGM_FRLG_TEACHY_TV); + PlayNewMapMusic(MUS_TVNOIZE); TeachyTvBg2AnimController(); if (++data[2] > 63) { @@ -1227,7 +1227,7 @@ static void TeachyTvRestorePlayerPartyCallback(void) if (gBattleOutcome == B_OUTCOME_DREW) SetTeachyTvControllerModeToResume(); else - PlayNewMapMusic(BGM_FRLG_FOLLOW_ME); + PlayNewMapMusic(MUS_ANNAI); CB2_ReturnToTeachyTV(); } diff --git a/src/text.c b/src/text.c index 5b88e9f75..b61713ee2 100644 --- a/src/text.c +++ b/src/text.c @@ -12,6 +12,7 @@ #include "window.h" #include "graphics.h" #include "dynamic_placeholder_text_util.h" +#include "constants/songs.h" extern u8 gGlyphInfo[0x90]; extern const struct OamData gOamData_83AC9D0; @@ -552,7 +553,7 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; - PlaySE(5); + PlaySE(SE_SELECT); } } return result; @@ -570,7 +571,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter) if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; - PlaySE(5); + PlaySE(SE_SELECT); } } return result; diff --git a/src/title_screen.c b/src/title_screen.c index 26770b633..44bdc7c0f 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -285,7 +285,7 @@ void CB2_InitTitleScreen(void) sTitleScreenTimerTaskId = CreateTask(Task_TitleScreenTimer, 2); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_TitleScreenRun); - m4aSongNumStart(BGM_FRLG_TITLE); + m4aSongNumStart(MUS_TITLE); } return; } diff --git a/src/tm_case.c b/src/tm_case.c index b9c89b6b3..ca149a6c6 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -1104,7 +1104,7 @@ static void Task_DoSaleOfTMs(u8 taskId) { s16 * data = gTasks[taskId].data; - PlaySE(0xF8); + PlaySE(SE_SHOP); RemoveBagItem(gSpecialVar_ItemId, data[8]); AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]); sub_809C09C(gSpecialVar_ItemId, data[8], 2); diff --git a/src/unk_815F138.c b/src/unk_815F138.c index 96005a07b..8aa776bc9 100644 --- a/src/unk_815F138.c +++ b/src/unk_815F138.c @@ -75,7 +75,7 @@ bool32 sub_815F2AC(u8 spriteId) // fallthrough case 1: if (sprite->data[2] == 0) - PlaySE(SE_TRACK_STOP); + PlaySE(SE_KON2); if (++sprite->data[2] >= 20) { sprite->data[2] = 0; @@ -167,7 +167,7 @@ void sub_815F470(struct Sprite * sprite) sprite->pos2.y = data[5] >> 4; if (sprite->pos2.y >= 0) { - PlaySE(SE_TRACK_STOP); + PlaySE(SE_KON2); sprite->pos2.y = 0; data[0]++; } @@ -176,7 +176,7 @@ void sub_815F470(struct Sprite * sprite) data[1] += 12; if (data[1] >= 128) { - PlaySE(SE_TRACK_STOP); + PlaySE(SE_KON2); data[1] = 0; data[0]++; } @@ -187,7 +187,7 @@ void sub_815F470(struct Sprite * sprite) data[1] += 16; if (data[1] >= 128) { - PlaySE(SE_TRACK_STOP); + PlaySE(SE_KON2); data[1] = 0; data[0]++; } diff --git a/src/vs_seeker.c b/src/vs_seeker.c index f7b29292a..cfc99551a 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -836,7 +836,7 @@ static void Task_VsSeeker_2(u8 taskId) if (data[2] != 2 && --data[1] == 0) { - PlaySE(SE_BASABASA); + PlaySE(SE_C_PIKON); data[1] = 11; data[2]++; } |