diff options
595 files changed, 1452 insertions, 1653 deletions
diff --git a/charmap.txt b/charmap.txt index 05eff3012..33e2f48af 100644 --- a/charmap.txt +++ b/charmap.txt @@ -451,242 +451,485 @@ DYNAMIC_COLOR6 = 0F @ cerulean @ 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 -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_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_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_HAIKI = 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 +SE_W085 = 76 00 +SE_W085B = 77 00 +SE_W231 = 78 00 +SE_W171 = 79 00 +SE_W233 = 7A 00 +SE_W233B = 7B 00 +SE_W145 = 7C 00 +SE_W145B = 7D 00 +SE_W145C = 7E 00 +SE_W240 = 7F 00 +SE_W015 = 80 00 +SE_W081 = 81 00 +SE_W081B = 82 00 +SE_W088 = 83 00 +SE_W016 = 84 00 +SE_W016B = 85 00 +SE_W003 = 86 00 +SE_W104 = 87 00 +SE_W013 = 88 00 +SE_W196 = 89 00 +SE_W086 = 8A 00 +SE_W004 = 8B 00 +SE_W025 = 8C 00 +SE_W025B = 8D 00 +SE_W152 = 8E 00 +SE_W026 = 8F 00 +SE_W172 = 90 00 +SE_W172B = 91 00 +SE_W053 = 92 00 +SE_W007 = 93 00 +SE_W092 = 94 00 +SE_W221 = 95 00 +SE_W221B = 96 00 +SE_W052 = 97 00 +SE_W036 = 98 00 +SE_W059 = 99 00 +SE_W059B = 9A 00 +SE_W010 = 9B 00 +SE_W011 = 9C 00 +SE_W017 = 9D 00 +SE_W019 = 9E 00 +SE_W028 = 9F 00 +SE_W013B = A0 00 +SE_W044 = A1 00 +SE_W029 = A2 00 +SE_W057 = A3 00 +SE_W056 = A4 00 +SE_W250 = A5 00 +SE_W030 = A6 00 +SE_W039 = A7 00 +SE_W054 = A8 00 +SE_W077 = A9 00 +SE_W020 = AA 00 +SE_W082 = AB 00 +SE_W047 = AC 00 +SE_W195 = AD 00 +SE_W006 = AE 00 +SE_W091 = AF 00 +SE_W146 = B0 00 +SE_W120 = B1 00 +SE_W153 = B2 00 +SE_W071B = B3 00 +SE_W071 = B4 00 +SE_W103 = B5 00 +SE_W062 = B6 00 +SE_W062B = B7 00 +SE_W048 = B8 00 +SE_W187 = B9 00 +SE_W118 = BA 00 +SE_W155 = BB 00 +SE_W122 = BC 00 +SE_W060 = BD 00 +SE_W185 = BE 00 +SE_W014 = BF 00 +SE_W043 = C0 00 +SE_W207 = C1 00 +SE_W207B = C2 00 +SE_W215 = C3 00 +SE_W109 = C4 00 +SE_W173 = C5 00 +SE_W280 = C6 00 +SE_W202 = C7 00 +SE_W060B = C8 00 +SE_W076 = C9 00 +SE_W080 = CA 00 +SE_W100 = CB 00 +SE_W107 = CC 00 +SE_W166 = CD 00 +SE_W129 = CE 00 +SE_W115 = CF 00 +SE_W112 = D0 00 +SE_W197 = D1 00 +SE_W199 = D2 00 +SE_W236 = D3 00 +SE_W204 = D4 00 +SE_W268 = D5 00 +SE_W070 = D6 00 +SE_W063 = D7 00 +SE_W127 = D8 00 +SE_W179 = D9 00 +SE_W151 = DA 00 +SE_W201 = DB 00 +SE_W161 = DC 00 +SE_W161B = DD 00 +SE_W227 = DE 00 +SE_W227B = DF 00 +SE_W226 = E0 00 +SE_W208 = E1 00 +SE_W213 = E2 00 +SE_W213B = E3 00 +SE_W234 = E4 00 +SE_W260 = E5 00 +SE_W328 = E6 00 +SE_W320 = E7 00 +SE_W255 = E8 00 +SE_W291 = E9 00 +SE_W089 = EA 00 +SE_W239 = EB 00 +SE_W230 = EC 00 +SE_W281 = ED 00 +SE_W327 = EE 00 +SE_W287 = EF 00 +SE_W257 = F0 00 +SE_W253 = F1 00 +SE_W258 = F2 00 +SE_W322 = F3 00 +SE_W298 = F4 00 +SE_W287B = F5 00 +SE_W114 = F6 00 +SE_W063B = F7 00 +SE_RG_W_DOOR = F8 00 +SE_RG_CARD1 = F9 00 +SE_RG_CARD2 = FA 00 +SE_RG_CARD3 = FB 00 +SE_RG_BAG1 = FC 00 +SE_RG_BAG2 = FD 00 +SE_RG_GETTING = FE 00 +SE_RG_SHOP = FF 00 +SE_RG_KITEKI = 00 01 +SE_RG_HELP_OP = 01 01 +SE_RG_HELP_CL = 02 01 +SE_RG_HELP_NG = 03 01 +SE_RG_DEOMOV = 04 01 +SE_RG_EXCELLENT = 05 01 +SE_RG_NAWAMISS = 06 01 +SE_TOREEYE = 07 01 +SE_TOREOFF = 08 01 +SE_HANTEI1 = 09 01 +SE_HANTEI2 = 0A 01 +SE_CURTAIN = 0B 01 +SE_CURTAIN1 = 0C 01 +SE_USSOKI = 0D 01 +MUS_TETSUJI = 5E 01 +MUS_FIELD13 = 5F 01 +MUS_KACHI22 = 60 01 +MUS_KACHI2 = 61 01 +MUS_KACHI3 = 62 01 +MUS_KACHI5 = 63 01 +MUS_PCC = 64 01 +MUS_NIBI = 65 01 +MUS_SUIKUN = 66 01 +MUS_DOORO1 = 67 01 +MUS_DOORO_X1 = 68 01 +MUS_DOORO_X3 = 69 01 +MUS_MACHI_S2 = 6A 01 +MUS_MACHI_S4 = 6B 01 +MUS_GIM = 6C 01 +MUS_NAMINORI = 6D 01 +MUS_DAN01 = 6E 01 +MUS_FANFA1 = 6F 01 +MUS_ME_ASA = 70 01 +MUS_ME_BACHI = 71 01 +MUS_FANFA4 = 72 01 +MUS_FANFA5 = 73 01 +MUS_ME_WAZA = 74 01 +MUS_BIJYUTU = 75 01 +MUS_DOORO_X4 = 76 01 +MUS_FUNE_KAN = 77 01 +MUS_ME_SHINKA = 78 01 +MUS_SHINKA = 79 01 +MUS_ME_WASURE = 7A 01 +MUS_SYOUJOEYE = 7B 01 +MUS_BOYEYE = 7C 01 +MUS_DAN02 = 7D 01 +MUS_MACHI_S3 = 7E 01 +MUS_ODAMAKI = 7F 01 +MUS_B_TOWER = 80 01 +MUS_SWIMEYE = 81 01 +MUS_DAN03 = 82 01 +MUS_ME_KINOMI = 83 01 +MUS_ME_TAMA = 84 01 +MUS_ME_B_BIG = 85 01 +MUS_ME_B_SMALL = 86 01 +MUS_ME_ZANNEN = 87 01 +MUS_BD_TIME = 88 01 +MUS_TEST1 = 89 01 +MUS_TEST2 = 8A 01 +MUS_TEST3 = 8B 01 +MUS_TEST4 = 8C 01 +MUS_TEST = 8D 01 +MUS_GOMACHI0 = 8E 01 +MUS_GOTOWN = 8F 01 +MUS_POKECEN = 90 01 +MUS_NEXTROAD = 91 01 +MUS_GRANROAD = 92 01 +MUS_CYCLING = 93 01 +MUS_FRIENDLY = 94 01 +MUS_MISHIRO = 95 01 +MUS_TOZAN = 96 01 +MUS_GIRLEYE = 97 01 +MUS_MINAMO = 98 01 +MUS_ASHROAD = 99 01 +MUS_EVENT0 = 9A 01 +MUS_DEEPDEEP = 9B 01 +MUS_KACHI1 = 9C 01 +MUS_TITLE3 = 9D 01 +MUS_DEMO1 = 9E 01 +MUS_GIRL_SUP = 9F 01 +MUS_HAGESHII = A0 01 +MUS_KAKKOII = A1 01 +MUS_KAZANBAI = A2 01 +MUS_AQA_0 = A3 01 +MUS_TSURETEK = A4 01 +MUS_BOY_SUP = A5 01 +MUS_RAINBOW = A6 01 +MUS_AYASII = A7 01 +MUS_KACHI4 = A8 01 +MUS_ROPEWAY = A9 01 +MUS_CASINO = AA 01 +MUS_HIGHTOWN = AB 01 +MUS_SAFARI = AC 01 +MUS_C_ROAD = AD 01 +MUS_AJITO = AE 01 +MUS_M_BOAT = AF 01 +MUS_M_DUNGON = B0 01 +MUS_FINECITY = B1 01 +MUS_MACHUPI = B2 01 +MUS_P_SCHOOL = B3 01 +MUS_DENDOU = B4 01 +MUS_TONEKUSA = B5 01 +MUS_MABOROSI = B6 01 +MUS_CON_FAN = B7 01 +MUS_CONTEST0 = B8 01 +MUS_MGM0 = B9 01 +MUS_T_BATTLE = BA 01 +MUS_OOAME = BB 01 +MUS_HIDERI = BC 01 +MUS_RUNECITY = BD 01 +MUS_CON_K = BE 01 +MUS_EIKOU_R = BF 01 +MUS_KARAKURI = C0 01 +MUS_HUTAGO = C1 01 +MUS_SITENNOU = C2 01 +MUS_YAMA_EYE = C3 01 +MUS_CONLOBBY = C4 01 +MUS_INTER_V = C5 01 +MUS_DAIGO = C6 01 +MUS_THANKFOR = C7 01 +MUS_END = C8 01 +MUS_B_FRONTIER = C9 01 +MUS_B_ARENA = CA 01 +MUS_ME_POINTGET = CB 01 +MUS_ME_TORE_EYE = CC 01 +MUS_PYRAMID = CD 01 +MUS_PYRAMID_TOP = CE 01 +MUS_B_PALACE = CF 01 +MUS_REKKUU_KOURIN = D0 01 +MUS_SATTOWER = D1 01 +MUS_ME_SYMBOLGET = D2 01 +MUS_B_DOME = D3 01 +MUS_B_TUBE = D4 01 +MUS_B_FACTORY = D5 01 +MUS_VS_REKKU = D6 01 +MUS_VS_FRONT = D7 01 +MUS_VS_MEW = D8 01 +MUS_B_DOME1 = D9 01 +MUS_BATTLE27 = DA 01 +MUS_BATTLE31 = DB 01 +MUS_BATTLE20 = DC 01 +MUS_BATTLE32 = DD 01 +MUS_BATTLE33 = DE 01 +MUS_BATTLE36 = DF 01 +MUS_BATTLE34 = E0 01 +MUS_BATTLE35 = E1 01 +MUS_BATTLE38 = E2 01 +MUS_BATTLE30 = E3 01 +MUS_RG_ANNAI = E4 01 +MUS_RG_SLOT = E5 01 +MUS_RG_AJITO = E6 01 +MUS_RG_GYM = E7 01 +MUS_RG_PURIN = E8 01 +MUS_RG_DEMO = E9 01 +MUS_RG_TITLE = EA 01 +MUS_RG_GUREN = EB 01 +MUS_RG_SHION = EC 01 +MUS_RG_KAIHUKU = ED 01 +MUS_RG_CYCLING = EE 01 +MUS_RG_ROCKET = EF 01 +MUS_RG_SHOUJO = F0 01 +MUS_RG_SHOUNEN = F1 01 +MUS_RG_DENDOU = F2 01 +MUS_RG_T_MORI = F3 01 +MUS_RG_OTSUKIMI = F4 01 +MUS_RG_POKEYASHI = F5 01 +MUS_RG_ENDING = F6 01 +MUS_RG_LOAD01 = F7 01 +MUS_RG_OPENING = F8 01 +MUS_RG_LOAD02 = F9 01 +MUS_RG_LOAD03 = FA 01 +MUS_RG_CHAMP_R = FB 01 +MUS_RG_VS_GYM = FC 01 +MUS_RG_VS_TORE = FD 01 +MUS_RG_VS_YASEI = FE 01 +MUS_RG_VS_LAST = FF 01 +MUS_RG_MASARA = 00 02 +MUS_RG_KENKYU = 01 02 +MUS_RG_OHKIDO = 02 02 +MUS_RG_POKECEN = 03 02 +MUS_RG_SANTOAN = 04 02 +MUS_RG_NAMINORI = 05 02 +MUS_RG_P_TOWER = 06 02 +MUS_RG_SHIRUHU = 07 02 +MUS_RG_HANADA = 08 02 +MUS_RG_TAMAMUSI = 09 02 +MUS_RG_WIN_TRE = 0A 02 +MUS_RG_WIN_YASEI = 0B 02 +MUS_RG_WIN_GYM = 0C 02 +MUS_RG_KUCHIBA = 0D 02 +MUS_RG_NIBI = 0E 02 +MUS_RG_RIVAL1 = 0F 02 +MUS_RG_RIVAL2 = 10 02 +MUS_RG_FAN2 = 11 02 +MUS_RG_FAN5 = 12 02 +MUS_RG_FAN6 = 13 02 +MUS_ME_RG_PHOTO = 14 02 +MUS_RG_TITLEROG = 15 02 +MUS_RG_GET_YASEI = 16 02 +MUS_RG_SOUSA = 17 02 +MUS_RG_SEKAIKAN = 18 02 +MUS_RG_SEIBETU = 19 02 +MUS_RG_JUMP = 1A 02 +MUS_RG_UNION = 1B 02 +MUS_RG_NETWORK = 1C 02 +MUS_RG_OKURIMONO = 1D 02 +MUS_RG_KINOMIKUI = 1E 02 +MUS_RG_NANADUNGEON = 1F 02 +MUS_RG_OSHIE_TV = 20 02 +MUS_RG_NANASHIMA = 21 02 +MUS_RG_NANAISEKI = 22 02 +MUS_RG_NANA123 = 23 02 +MUS_RG_NANA45 = 24 02 +MUS_RG_NANA67 = 25 02 +MUS_RG_POKEFUE = 26 02 +MUS_RG_VS_DEO = 27 02 +MUS_RG_VS_MYU2 = 28 02 +MUS_RG_VS_DEN = 29 02 +MUS_RG_EXEYE = 2A 02 +MUS_RG_DEOEYE = 2B 02 +MUS_RG_T_TOWER = 2C 02 +MUS_RG_SLOWMASARA = 2D 02 +MUS_RG_TVNOIZE = 2E 02 UNK_CTRL_F800 = F8 00 UNK_CTRL_F801 = F8 01 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4efa72858..b442d74b5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3177,7 +3177,7 @@ BattleScript_Pausex20:: return BattleScript_LevelUp:: - fanfare BGM_FANFA1 + fanfare MUS_FANFA1 printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0x0 drawlvlupbox @@ -3205,7 +3205,7 @@ BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_ANDELLIPSIS BattleScript_LearnedNewMove:: buffermovetolearn - fanfare BGM_FANFA1 + fanfare MUS_FANFA1 printstring STRINGID_PKMNLEARNEDMOVE waitmessage 0x40 updatechoicemoveonlvlup ATTACKER diff --git a/data/event_scripts.s b/data/event_scripts.s index df3e6c9ec..d25717007 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -805,7 +805,7 @@ Std_5: @ 8271332 Std_9: @ 827133C message 0x0 - playfanfare BGM_ME_BATTLE_POINTS + playfanfare MUS_ME_POINTGET waitfanfare waitmessage return @@ -1593,11 +1593,11 @@ EventScript_271BA9:: @ 8271BA9 return EventScript_271BAF:: @ 8271BAF - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 return EventScript_271BB3:: @ 8271BB3 - playfanfare BGM_ME_WAZA + playfanfare MUS_ME_WAZA return Std_ObtainDecoration:: @ 8271BB7 @@ -1615,7 +1615,7 @@ EventScript_271BC5:: @ 8271BC5 return EventScript_271BE0:: @ 8271BE0 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message gUnknown_08272B09 waitfanfare msgbox gUnknown_08272B48, 4 @@ -1785,7 +1785,7 @@ EventScript_271DBC:: @ 8271DBC end EventScript_271DF9:: @ 8271DF9 - playse SE_PC_LOGON + playse SE_PC_LOGIN msgbox gUnknown_082726C2, 4 special sub_816AE98 waitstate @@ -1793,7 +1793,7 @@ EventScript_271DF9:: @ 8271DF9 end EventScript_271E0E:: @ 8271E0E - playse SE_PC_LOGON + playse SE_PC_LOGIN checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_271E35 checkflag FLAG_SYS_PC_LANETTE @@ -1822,7 +1822,7 @@ EventScript_271E47:: @ 8271E47 EventScript_271E54:: @ 8271E54 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_271E47 - playse SE_PC_LOGON + playse SE_PC_LOGIN special sub_8137C28 waitstate goto EventScript_271DBC @@ -2182,7 +2182,7 @@ MossdeepCity_Gym_EventScript_27207E:: @ 827207E PetalburgCity_Gym_EventScript_27207E:: @ 827207E RustboroCity_Gym_EventScript_27207E:: @ 827207E SootopolisCity_Gym_1F_EventScript_27207E:: @ 827207E - playfanfare BGM_ME_BACHI + playfanfare MUS_ME_BACHI waitfanfare return @@ -2192,7 +2192,7 @@ Route119_WeatherInstitute_1F_EventScript_272083:: @ 8272083 RustboroCity_DevonCorp_3F_EventScript_272083:: @ 8272083 SSTidalRooms_EventScript_272083:: @ 8272083 fadescreen 1 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon fadescreen 0 @@ -2211,7 +2211,7 @@ DewfordTown_EventScript_2720A0:: @ 82720A0 Route104_EventScript_2720A0:: @ 82720A0 Route109_EventScript_2720A0:: @ 82720A0 setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm BGM_M_BOAT, 0 + playbgm MUS_M_BOAT, 0 return DewfordTown_EventScript_2720A8:: @ 82720A8 @@ -2569,7 +2569,7 @@ FallarborTown_House1_EventScript_2723E4:: @ 82723E4 GraniteCave_StevensRoom_EventScript_2723E4:: @ 82723E4 SlateportCity_OceanicMuseum_2F_EventScript_2723E4:: @ 82723E4 bufferitemname 0, VAR_0x8004 - playfanfare BGM_ME_WAZA + playfanfare MUS_ME_WAZA message gUnknown_08273161 waitmessage waitfanfare @@ -4079,7 +4079,7 @@ Std_8:: @ 82742C9 buffertrainername 1, VAR_0x8000 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox gUnknown_08272E0F, 4 waitfanfare closemessage diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 143d0c61e..5c6bae920 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -3,7 +3,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 195 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 5aa0d11c2..7d1582721 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 187 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 39d3c52ea..2205786fe 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 189 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 563401ca7..f83905c8f 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Deck: @ 84844A8 .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 186 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index e71aa5764..fc93ec42d 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 289 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 08fd1b2cb..cb8f99732 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 310 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3e717ffb2..68b484f68 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Room_B1F: @ 848456C .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 193 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 7f7b8140c..d712be55f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 194 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index ce86c382a..1b5cbb68a 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 191 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 46014cde9..68dbcbbdb 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 188 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index f9fab80eb..219410a9f 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 190 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index c3864d6c4..b314f5028 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Underwater1: @ 8484550 .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 192 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index b8b591eed..3f15871b7 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Underwater2: @ 84845C0 .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 196 .byte 61 .byte 0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index bc062c9d5..98a23f76a 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -3,7 +3,7 @@ AlteringCave: @ 8484A58 .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 420 .byte 210 .byte 0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index daf7c5c2d..2d384b07b 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -3,7 +3,7 @@ AncientTomb: @ 8484630 .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 281 .byte 83 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index b9b43b2d2..d2f8601bf 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -3,7 +3,7 @@ AquaHideout_1F: @ 8484144 .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 143 .byte 197 .byte 0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 401f3ba9a..e5a70a5c0 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -3,7 +3,7 @@ AquaHideout_B1F: @ 8484160 .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 144 .byte 197 .byte 0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 6e4304732..0f3849799 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -3,7 +3,7 @@ AquaHideout_B2F: @ 848417C .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 145 .byte 197 .byte 0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 1b678dfd1..b32ecf901 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 316 .byte 197 .byte 0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 17d98b346..dec1a5311 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 317 .byte 197 .byte 0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 73c8d7c0d..a2383a4a6 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 318 .byte 197 .byte 0 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index dbfd31dba..1c363e7c9 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -3,7 +3,7 @@ ArtisanCave_1F: @ 84849B0 .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 401 .byte 202 .byte 0 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 3caf8f660..844f627c1 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -3,7 +3,7 @@ ArtisanCave_B1F: @ 8484994 .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 400 .byte 202 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index f55683ddf..19e6f0413 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_ARENA + .2byte MUS_B_ARENA .2byte 356 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 2820635f3..d70d50b1d 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_ARENA + .2byte MUS_B_ARENA .2byte 355 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 660d353c1..36522126d 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_ARENA + .2byte MUS_B_ARENA .2byte 354 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 3a7eca639..ab6254403 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_DOME_TOURNAMENT + .2byte MUS_B_DOME .2byte 335 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index a9093cc84..f91cfe2d4 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_DOME + .2byte MUS_B_DOME1 .2byte 333 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index e7b1c9935..0626aea77 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_DOME + .2byte MUS_B_DOME1 .2byte 332 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index a2c9d8bf6..7e06ab60a 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_DOME_TOURNAMENT + .2byte MUS_B_DOME .2byte 334 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 5ae64a1f5..51aa2cb06 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_FACTORY + .2byte MUS_B_FACTORY .2byte 348 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index b376011f4..f4304d579 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_FACTORY + .2byte MUS_B_FACTORY .2byte 346 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index b8427f82f..debeb0c12 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_FACTORY + .2byte MUS_B_FACTORY .2byte 347 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 4bfde6991..99c95d07d 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PALACE + .2byte MUS_B_PALACE .2byte 344 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index a3786f794..4dec7d651 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PALACE + .2byte MUS_B_PALACE .2byte 343 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 357a5d9e6..4bf9326b7 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PALACE + .2byte MUS_B_PALACE .2byte 342 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 3c305dbee..f2bf0501b 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 350 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index c1533a1ed..2b7709152 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 349 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index f932492e0..89c74c18a 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 352 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 35191e707..425df7bcb 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 353 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 69fcb0ee0..e3518c68b 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 358 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 95da241ae..a9e768832 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PIKE + .2byte MUS_B_TUBE .2byte 351 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index d0b08b300..150d9cc03 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 398 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index fe8235101..ab9d35d81 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_PYRAMID + .2byte MUS_PYRAMID .2byte 360 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 53542ab96..bc54d421a 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 268 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index fffa32e0d..b9e17e9aa 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 268 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 54a836985..f72c8fe29 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 267 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 2988c9d32..6332bc83b 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 391 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 50cbdd309..1dd6b495e 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 266 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 8706ecb7f..94d43eb89 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 264 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index b02e91000..293fd6418 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -3,7 +3,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_BATTLE_TOWER + .2byte MUS_SATTOWER .2byte 390 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 6a85c8f6d..97eb721b6 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge1: @ 84855B8 .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index cd5c77c97..b5a1367b5 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge2: @ 84855F0 .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 397 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index af18dd057..21cd2cc38 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge3: @ 848560C .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 4c1c34bbd..e550557ca 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge4: @ 8485628 .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index beb6adceb..dbe0afa67 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge5: @ 8485660 .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 397 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 7b41b7d47..c41376cfd 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge6: @ 848567C .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 4c4096a18..0348fd64c 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge7: @ 8485698 .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 1517fb67c..9ec0f336f 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge8: @ 84856D0 .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 388b0c1ec..d88f40095 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Lounge9: @ 84856EC .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 429 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 2a81bf2f6..b0cd11e40 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -3,7 +3,7 @@ BattleFrontier_Mart: @ 8485740 .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index ca6b4ea3d..f40bfc1f3 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -3,7 +3,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections - .2byte BGM_BATTLE_FRONTIER + .2byte MUS_B_FRONTIER .2byte 345 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index bc9dd7dea..24f1ce14b 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -3,7 +3,7 @@ BattleFrontier_OutsideWest: @ 84851AC .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections - .2byte BGM_BATTLE_FRONTIER + .2byte MUS_B_FRONTIER .2byte 265 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 08718a5cd..561aba67e 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index ce6bb9e21..6aa965d08 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 067cd783e..b068fbacc 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -3,7 +3,7 @@ BattleFrontier_RankingHall: @ 848559C .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 - .2byte BGM_BIJYUTU + .2byte MUS_BIJYUTU .2byte 396 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index fa89d7c99..32387ef0d 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -3,7 +3,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 399 .byte 58 .byte 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 0dfb989d4..1ac7c9524 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -3,7 +3,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 430 .byte 58 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 1d15339d7..97b1a7664 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_1F: @ 84842E8 .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 158 .byte 72 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 24e245e20..f2eab2e2b 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_Entrance: @ 84842CC .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 157 .byte 72 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 734e2d2ad..081d1bba3 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 159 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 63b629e0a..ef1747de8 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 160 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index e3f7d3fad..623c9c2bc 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 161 .byte 72 .byte 1 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 617568f5c..dcc150a4f 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -3,7 +3,7 @@ DesertRuins: @ 8483F68 .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 131 .byte 82 .byte 0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 1a253a839..b01e7638a 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -3,7 +3,7 @@ DesertUnderpass: @ 8484978 .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 389 .byte 209 .byte 0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index b0e34c3b3..7437a42a2 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -3,7 +3,7 @@ DewfordTown: @ 84825EC .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 12 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 04946f4b8..4d2dbcef9 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -3,7 +3,7 @@ DewfordTown_Gym: @ 8482C60 .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 65 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 97afc139c..22466b2a8 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -3,7 +3,7 @@ DewfordTown_Hall: @ 8482C7C .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 66 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 3b4a236f0..399786aa9 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -3,7 +3,7 @@ DewfordTown_House1: @ 8482C0C .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 64 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index b0d09baa7..d9a2162e2 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -3,7 +3,7 @@ DewfordTown_House2: @ 8482C98 .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 67 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index a9eb10a91..bdc1b5090 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 9206bb564..f5302fff1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 2 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 61ab5bccd..6d102c5b1 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -3,7 +3,7 @@ DoubleBattleColosseum: @ 8484D84 .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 224 .byte 87 .byte 0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 5ae9fcb36..f7fc65752 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -3,7 +3,7 @@ EverGrandeCity: @ 8482598 .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 9 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index ea45c416b..445536d27 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 115 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 18b46c1e2..6d6438a79 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 114 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 328308ce7..b301c2aa1 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 113 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 433a41352..332a6cbb2 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall1: @ 8483C58 .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index c8a77751d..b9029c027 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall2: @ 8483C74 .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d6a05734f..282d06c66 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall3: @ 8483C90 .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 511e8873e..72fa22d75 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall4: @ 8483CAC .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 315 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 7907489a0..eac2ba3fa 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index d91044f10..dd3726db9 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 - .2byte BGM_EIKOU_R + .2byte MUS_EIKOU_R .2byte 298 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 3d2321bff..a5ebfb823 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 112 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 32f35a157..a3747320b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index c7e4b2917..1ad6c5727 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 0921e41a5..46fa79a73 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 270 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 1811dd10d..1d7775bfc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 8ec323838..594347dc3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 111 .byte 15 .byte 0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 1b4df9b80..a6ea87c04 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -3,7 +3,7 @@ FallarborTown: @ 8482624 .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 14 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index ed7556471..2a5695153 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -3,7 +3,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 386 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 024894c7c..6ac376874 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -3,7 +3,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 385 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 0fb27e1d9..64d4180a5 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -3,7 +3,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 384 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index d413c18b8..bbe9d895c 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -3,7 +3,7 @@ FallarborTown_House1: @ 8482E20 .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 59 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 548e2dc09..bf6d91d02 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -3,7 +3,7 @@ FallarborTown_House2: @ 8482E3C .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 60 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index b210fbe4c..70ff79eb7 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -3,7 +3,7 @@ FallarborTown_Mart: @ 8482D78 .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 1258df061..c3b9ec95d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 1a99a604c..655221b8a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 4 .byte 0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 2e8720ab6..8e943d6c3 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -3,7 +3,7 @@ FarawayIsland_Entrance: @ 848575C .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 402 .byte 201 .byte 0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 2669d360a..6d5e3f2d7 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -3,7 +3,7 @@ FarawayIsland_Interior: @ 8485778 .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 403 .byte 201 .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 1c4c59e3a..0cb60553b 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -3,7 +3,7 @@ FieryPath: @ 8484048 .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 293 .byte 74 .byte 0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 9cbb544e1..6b78eeee1 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -3,7 +3,7 @@ FortreeCity: @ 8482528 .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 5 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index f3108c361..000c589c6 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -3,7 +3,7 @@ FortreeCity_DecorationShop: @ 848361C .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 255 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index bc2af7730..08e50e944 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -3,7 +3,7 @@ FortreeCity_Gym: @ 848353C .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 100 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index ec239aa37..4aeeb4425 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -3,7 +3,7 @@ FortreeCity_House1: @ 8483520 .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 3c6c6f5ec..30cad4def 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -3,7 +3,7 @@ FortreeCity_House2: @ 84835AC .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index b9482eaff..2e2c7813d 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -3,7 +3,7 @@ FortreeCity_House3: @ 84835C8 .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 61453ee82..59c17803e 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -3,7 +3,7 @@ FortreeCity_House4: @ 84835E4 .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 0f98a0a2b..deaa634a8 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -3,7 +3,7 @@ FortreeCity_House5: @ 8483600 .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index ad102af2d..03ee88852 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -3,7 +3,7 @@ FortreeCity_Mart: @ 8483590 .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index a7e525f6e..d065198ad 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 693b04eb7..5eb3483c3 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 11 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 320567d23..ebd93d4eb 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -3,7 +3,7 @@ GraniteCave_1F: @ 8483F84 .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 132 .byte 55 .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 798aec9f2..de946f84c 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -3,7 +3,7 @@ GraniteCave_B1F: @ 8483FA0 .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 133 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 2ec2c7089..0442638f9 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -3,7 +3,7 @@ GraniteCave_B2F: @ 8483FBC .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 134 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 1734d1114..569d46b98 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -3,7 +3,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 288 .byte 55 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 454c3cf92..9b9e2b739 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -3,7 +3,7 @@ IslandCave: @ 8484614 .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 280 .byte 81 .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 24e700ebb..ad1a4640f 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -3,7 +3,7 @@ JaggedPass: @ 848402C .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 292 .byte 76 .byte 0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index c107a2643..138cc6778 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -3,7 +3,7 @@ LavaridgeTown: @ 8482608 .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 13 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index a82f59c89..f473ddaee 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 69 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 0d7857c1a..c188cd5ba 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 70 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 6afc82a8b..5e3fd99a0 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 68 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f9f8dbfeb..f48bf4035 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_House: @ 8482D08 .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 64 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 05a9c6b94..b3f901570 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Mart: @ 8482D24 .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index bb99b86d5..30009b084 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 71 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index d81479abe..26a5fd642 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 3 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 5f063576e..37ec48371 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -3,7 +3,7 @@ LilycoveCity: @ 8482544 .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 6 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 4aa6ce82a..f8f05f874 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -3,7 +3,7 @@ LilycoveCity_ContestHall: @ 84836C4 .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 106 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 9ff5e1978..674726f47 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -3,7 +3,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 105 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 9cae21a94..149ff5359 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 299 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index abaa01313..ade9f1a37 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 300 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 4f71e1479..959699237 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 273 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index dee8b5b4e..3cf0cac45 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 262 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 263b13ad8..140fe3568 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 257 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 7ca78c745..7d28c44b6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 258 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 796b58232..2f94cc924 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 259 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index c86acb62c..8318c0edc 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 260 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 1336b59c6..da0c4a399 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 261 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 4a79f9691..1d8faa5d4 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor: @ 8483750 .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 88 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ebff864c0..c298fe5f1 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House1: @ 8483788 .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index d589b3c55..b2276441c 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House2: @ 84837A4 .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 74 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index cb79f9bf6..2f3c3dc74 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House3: @ 84837C0 .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index c971f6d7d..6a2acb155 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House4: @ 84837DC .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index a354518a9..8b534ed9a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 - .2byte BGM_BIJYUTU + .2byte MUS_BIJYUTU .2byte 103 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 77630b6b4..0cbbfb2e5 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 - .2byte BGM_BIJYUTU + .2byte MUS_BIJYUTU .2byte 104 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 6d0b19df0..5ef550b69 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 477bfd87b..81f460c86 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 30f10e387..d145bab55 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index eb5b6e74e..8d2f17dc6 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 107 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index d205d5312..29e3bd57c 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -3,7 +3,7 @@ LilycoveCity_UnusedMart: @ 8483718 .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 12 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index e257caad9..f5d7b9b78 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -3,7 +3,7 @@ LinkContestRoom1: @ 8484DA0 .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 225 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f370ad121..b083a3a93 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -3,7 +3,7 @@ LinkContestRoom2: @ 8484E64 .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 232 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index f7deff02d..ec0e6ee7b 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -3,7 +3,7 @@ LinkContestRoom3: @ 8484E80 .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 233 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 1d25edacb..4a172b61f 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -3,7 +3,7 @@ LinkContestRoom4: @ 8484E9C .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 234 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 59a9c2d3b..a26034ac6 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -3,7 +3,7 @@ LinkContestRoom5: @ 8484EB8 .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 235 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index c09392bf9..436f89047 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -3,7 +3,7 @@ LinkContestRoom6: @ 8484ED4 .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 236 .byte 87 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 3b9655a8c..240429a6d 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -3,7 +3,7 @@ LittlerootTown: @ 84825B4 .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 10 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index cbac012de..781e37506 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 54 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 35946ac05..12047b040 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 55 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 6da065fab..624be65cb 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 56 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index bb48d9bcf..a22e64716 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 57 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 84409297e..c58220612 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -3,7 +3,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 - .2byte BGM_ODAMAKI + .2byte MUS_ODAMAKI .2byte 58 .byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index b768e2996..eab20d0d0 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -3,7 +3,7 @@ MagmaHideout_1F: @ 8484828 .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 336 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 503dd0d73..ff19befab 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_2F_1R: @ 8484844 .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 337 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 9407bb8e8..8fe07f9ca 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_2F_2R: @ 8484860 .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 338 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 87360978c..45ea7c94b 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_2F_3R: @ 84848EC .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 380 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 7338ebf27..70ce39e74 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_1R: @ 848487C .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 339 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 224cb4d02..74266da9c 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_2R: @ 8484898 .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 340 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index df152cb6c..5c1cdc9de 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_3R: @ 84848D0 .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 379 .byte 198 .byte 0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 98df121a2..441643653 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -3,7 +3,7 @@ MagmaHideout_4F: @ 84848B4 .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 341 .byte 198 .byte 0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 8a3bcdc98..2eda73be9 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -3,7 +3,7 @@ MarineCave_End: @ 8484A04 .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 413 .byte 203 .byte 0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 219ab2712..a1e97eb95 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -3,7 +3,7 @@ MarineCave_Entrance: @ 84849E8 .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 407 .byte 203 .byte 0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index c9bbb62c1..f8dada766 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -3,7 +3,7 @@ MauvilleCity: @ 84824F0 .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 3 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 7523d3344..723d61151 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -3,7 +3,7 @@ MauvilleCity_BikeShop: @ 8483280 .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 90 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index acad413c2..9ef8ce976 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -3,7 +3,7 @@ MauvilleCity_GameCorner: @ 84832B8 .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 - .2byte BGM_CASINO + .2byte MUS_CASINO .2byte 91 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index a858b0c31..343a2f01a 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym: @ 8483264 .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 89 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index d4c8b5923..1cf42f8cf 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -3,7 +3,7 @@ MauvilleCity_House1: @ 848329C .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index b29a1666b..c1d2da264 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -3,7 +3,7 @@ MauvilleCity_House2: @ 84832D4 .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index a6e0b0fc3..c8f5dfb88 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -3,7 +3,7 @@ MauvilleCity_Mart: @ 8483328 .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 715655b50..39a942e6f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 78d2301e4..c09589b5a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 9 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index a451bdcec..6ec850978 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 125 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 4f8ebbff4..946b15c66 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R: @ 8483EDC .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 126 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index c39710f33..a138eeb06 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 127 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index dfee7e50e..2d3f50932 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 128 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index b30ae1da5..d5415ea46 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -3,7 +3,7 @@ MeteorFalls_StevensCave: @ 8484A74 .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 431 .byte 63 .byte 0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 7d3cde71e..27611506e 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -3,7 +3,7 @@ MirageTower_1F: @ 8484908 .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 381 .byte 199 .byte 0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 304212a0b..f512754e7 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -3,7 +3,7 @@ MirageTower_2F: @ 8484924 .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 382 .byte 199 .byte 0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 2b0ca6c69..bdd93292e 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -3,7 +3,7 @@ MirageTower_3F: @ 8484940 .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 383 .byte 199 .byte 0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 4d319fe5d..ff38fd9ca 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -3,7 +3,7 @@ MirageTower_4F: @ 848495C .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 388 .byte 199 .byte 0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 155706b5d..c21d4f7f9 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -3,7 +3,7 @@ MossdeepCity: @ 8482560 .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 7 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index fef2ebae1..7e2adace8 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 305 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index e369f8488..6b4a75713 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 306 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index cf9b14394..1bb806541 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -3,7 +3,7 @@ MossdeepCity_Gym: @ 84838BC .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 108 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index ba20cbb55..5260cf931 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House1: @ 84838D8 .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index ba845b72b..1d0463231 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House2: @ 84838F4 .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index b1359288e..d474eab75 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House3: @ 8483964 .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 8e9c7a9c4..30fe8c01a 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House4: @ 848399C .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 80 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index d09103549..d745cc8f4 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -3,7 +3,7 @@ MossdeepCity_Mart: @ 8483948 .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 6b69cc8b9..0b9faca99 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 715a2a939..45e4f0881 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 679f0f576..b503f8580 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 275 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index a0e66bd48..388482c64 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 276 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 806d47883..179ebd36e 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -3,7 +3,7 @@ MossdeepCity_StevensHouse: @ 8483980 .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 327 .byte 13 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index f8dfa991a..885541dde 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -3,7 +3,7 @@ MtChimney: @ 8484010 .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 136 .byte 56 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 7c531570e..e3f29070f 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -3,7 +3,7 @@ MtChimney_CableCarStation: @ 8483DFC .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 118 .byte 56 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 83234f6d9..519211b49 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -3,7 +3,7 @@ MtPyre_1F: @ 8484064 .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 137 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index f7251c337..6eb960c01 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -3,7 +3,7 @@ MtPyre_2F: @ 8484080 .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 138 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 445ad8206..9dcd40578 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -3,7 +3,7 @@ MtPyre_3F: @ 848409C .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 139 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 4ab79b0d3..c94284c2f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -3,7 +3,7 @@ MtPyre_4F: @ 84840B8 .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 140 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 9b34efafe..efabc0917 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -3,7 +3,7 @@ MtPyre_5F: @ 84840D4 .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 141 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 72d2808f0..f6931369b 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -3,7 +3,7 @@ MtPyre_6F: @ 84840F0 .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 142 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index c9c8e7380..7d9df6a8e 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -3,7 +3,7 @@ MtPyre_Exterior: @ 848410C .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 - .2byte BGM_MACHUPI + .2byte MUS_MACHUPI .2byte 302 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 7f62acb50..ffdb8fb8a 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -3,7 +3,7 @@ MtPyre_Summit: @ 8484128 .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 - .2byte BGM_MACHUPI + .2byte MUS_MACHUPI .2byte 303 .byte 65 .byte 0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 99d66911f..8570628b2 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -3,7 +3,7 @@ NavelRock_B1F: @ 84858C8 .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 427 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index c14a2a33a..e40c64d91 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -3,7 +3,7 @@ NavelRock_Bottom: @ 8485AC0 .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 424 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 398493f52..af66bb9bc 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -3,7 +3,7 @@ NavelRock_Down01: @ 848598C .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index d852e71b6..8b70d543f 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -3,7 +3,7 @@ NavelRock_Down02: @ 84859A8 .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 67d6cade8..78d1e1db3 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -3,7 +3,7 @@ NavelRock_Down03: @ 84859C4 .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 9aa24c310..ea459e2ff 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -3,7 +3,7 @@ NavelRock_Down04: @ 84859E0 .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index f4fd2057a..ddb4d997f 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -3,7 +3,7 @@ NavelRock_Down05: @ 84859FC .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 5d135527f..256d2d1c1 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -3,7 +3,7 @@ NavelRock_Down06: @ 8485A18 .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 50cdebf34..d49181bc4 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -3,7 +3,7 @@ NavelRock_Down07: @ 8485A34 .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index c15ca867e..db1c426c2 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -3,7 +3,7 @@ NavelRock_Down08: @ 8485A50 .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 57636fd9b..6f53a936f 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -3,7 +3,7 @@ NavelRock_Down09: @ 8485A6C .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index c34916015..f3945194a 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -3,7 +3,7 @@ NavelRock_Down10: @ 8485A88 .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 0842774a0..d02b578a1 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -3,7 +3,7 @@ NavelRock_Down11: @ 8485AA4 .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 2770d9005..521af14c7 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -3,7 +3,7 @@ NavelRock_Entrance: @ 84858AC .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 422 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 9b77fae48..5d74b9eab 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -3,7 +3,7 @@ NavelRock_Exterior: @ 8485874 .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 - .2byte BGM_FRLG_SEVII_ISLANDS + .2byte MUS_RG_NANASHIMA .2byte 421 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 0bb1df72d..94740f43b 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -3,7 +3,7 @@ NavelRock_Fork: @ 84858E4 .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 428 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 9af423363..644442986 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -3,7 +3,7 @@ NavelRock_Harbor: @ 8485890 .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 - .2byte BGM_FRLG_SEVII_ISLANDS + .2byte MUS_RG_NANASHIMA .2byte 405 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 691bdd2a6..f6e72236f 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -3,7 +3,7 @@ NavelRock_Top: @ 8485970 .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 423 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 37ee4bdcd..d9a51ab0f 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -3,7 +3,7 @@ NavelRock_Up1: @ 8485900 .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 4ce083ea7..94d42c6c4 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -3,7 +3,7 @@ NavelRock_Up2: @ 848591C .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index c683f402c..2a57b2444 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -3,7 +3,7 @@ NavelRock_Up3: @ 8485938 .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 425 .byte 211 .byte 0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 2ef111cfd..17e8ae965 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -3,7 +3,7 @@ NavelRock_Up4: @ 8485954 .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 - .2byte BGM_FRLG_MT_EMBER + .2byte MUS_RG_NANADUNGEON .2byte 426 .byte 211 .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 21263d9f7..8bdf39e18 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -3,7 +3,7 @@ NewMauville_Entrance: @ 8484470 .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 184 .byte 62 .byte 0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 5784acd35..585719630 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -3,7 +3,7 @@ NewMauville_Inside: @ 848448C .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 185 .byte 62 .byte 0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index e000987db..3eeb1e72d 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -3,7 +3,7 @@ OldaleTown: @ 84825D0 .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 11 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index f39cc9a39..245f1e146 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -3,7 +3,7 @@ OldaleTown_House1: @ 8482B80 .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 59 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 8c88814f1..7bf092b6b 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -3,7 +3,7 @@ OldaleTown_House2: @ 8482B9C .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 60 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index e2ac903a3..4f4ea646f 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -3,7 +3,7 @@ OldaleTown_Mart: @ 8482BF0 .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 1d14d924d..cc564e6ae 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 5417fb67b..798a5f72b 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 1 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index d883ed7d7..a630f5efa 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -3,7 +3,7 @@ PacifidlogTown: @ 848265C .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 16 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 224d9da80..a0e8763e3 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House1: @ 8482F8C .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index aa005a306..8548cfc32 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House2: @ 8482FA8 .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 6bfefd00a..7fa97cda2 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House3: @ 8482FC4 .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index fad1fa0e8..b505892ad 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House4: @ 8482FE0 .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index aab011d9b..055a1b566 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House5: @ 8482FFC .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index ee83a387e..0c84c8b8a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index f2d6605d7..6804ac368 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 6 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index a78619139..d87259512 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -3,7 +3,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_MapEvents .4byte gStdScripts_End .4byte PetalburgCity_MapConnections - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 1 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index e3c7c3cf7..18a39e943 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -3,7 +3,7 @@ PetalburgCity_Gym: @ 8483034 .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 79 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 38428c30a..2175ff856 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -3,7 +3,7 @@ PetalburgCity_House1: @ 8483050 .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 59 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 07b4ee885..9213bc710 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -3,7 +3,7 @@ PetalburgCity_House2: @ 848306C .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 80 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 2e9f8df17..d2dc3edf3 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -3,7 +3,7 @@ PetalburgCity_Mart: @ 84830C0 .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index fd59dc90e..581432e20 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 53affa40f..c16cfdee2 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index c54f5c32d..fc953bf81 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -3,7 +3,7 @@ PetalburgCity_WallysHouse: @ 8483018 .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 60 .byte 7 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 7eca96e6f..1b1731f58 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -3,7 +3,7 @@ PetalburgWoods: @ 8483FF4 .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 135 .byte 59 .byte 0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 9fd5f13f5..67ebd9405 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -3,7 +3,7 @@ RecordCorner: @ 8484D68 .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 223 .byte 87 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index dcab12376..9550dc26b 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -3,7 +3,7 @@ Route101: @ 8482678 .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 17 .byte 16 .byte 0 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 79e726fe1..2c06344b0 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -3,7 +3,7 @@ Route102: @ 8482694 .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 18 .byte 17 .byte 0 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 470cfbdc2..6bc4c0070 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -3,7 +3,7 @@ Route103: @ 84826B0 .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 19 .byte 18 .byte 0 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 7efc69c08..7bcef3b0b 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -3,7 +3,7 @@ Route104: @ 84826CC .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 20 .byte 19 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index cc7767bc4..f285f28ee 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse: @ 8483D70 .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 102 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index b7a8a4a18..ceac3651f 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 117 .byte 19 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 5848bf3fd..9728190a1 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -3,7 +3,7 @@ Route104_Prototype: @ 8485AF8 .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 287 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 39e57f344..ac5604d72 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -3,7 +3,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 117 .byte 19 .byte 0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 1df88f877..de48be1a5 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -3,7 +3,7 @@ Route105: @ 84826E8 .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 21 .byte 20 .byte 0 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 1e944a5b9..5ee6a3071 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -3,7 +3,7 @@ Route106: @ 8482704 .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 22 .byte 21 .byte 0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index d508e2346..d6dffda04 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -3,7 +3,7 @@ Route107: @ 8482720 .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 23 .byte 22 .byte 0 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index d4542cb24..e0a0c9f42 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -3,7 +3,7 @@ Route108: @ 848273C .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 24 .byte 23 .byte 0 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 749c52643..532443e1b 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -3,7 +3,7 @@ Route109: @ 8482758 .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 25 .byte 24 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index dd4b098e9..99c905eaa 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse: @ 8485B30 .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 243 .byte 24 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index ffbae7d28..5a74c1d6c 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -3,7 +3,7 @@ Route110: @ 8482774 .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 26 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc index b11a4e74e..433849c14 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadEntrance1: @ 8485C80 .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 256 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc index 7102a670c..755b6a5ff 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadEntrance2: @ 8485C9C .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 256 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index c605c80b2..b8f569c6a 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 246 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index d965eacf6..7f69874d1 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseEnd: @ 8485B68 .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 245 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 01db89ecd..f3aa39cc5 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 244 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 84fe3c0f1..ff78e3652 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 247 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 37259a907..25aa8b8dc 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 248 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 199f7ff22..9cd8c45be 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 249 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index d44eed5a1..c928f08f3 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 250 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 1c8f0a7fd..d8b57d744 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 251 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 50a1dde0d..5864cdd59 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 252 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index df10ee4b1..e9217f7e2 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 253 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index b569f0721..d9fce791e 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 254 .byte 25 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 0eacd64e3..804a36387 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -3,7 +3,7 @@ Route111: @ 8482790 .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 27 .byte 26 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 5543bd06c..8de668c4b 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 64 .byte 26 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 1ae67a0e6..86a766b6d 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -3,7 +3,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 26 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index ed5f682cf..e0411ce05 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -3,7 +3,7 @@ Route112: @ 84827AC .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 28 .byte 27 .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 7a36e0e11..6caefade9 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -3,7 +3,7 @@ Route112_CableCarStation: @ 8483DE0 .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 118 .byte 27 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 35f16139d..a8c19f49d 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -3,7 +3,7 @@ Route113: @ 84827C8 .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections - .2byte BGM_KAZANBAI + .2byte MUS_KAZANBAI .2byte 29 .byte 28 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 0c06ce631..49c0005b0 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop: @ 8485CB8 .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 67 .byte 28 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index f7bff7b83..5b9db262a 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -3,7 +3,7 @@ Route114: @ 84827E4 .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 30 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 38ead1057..277c0c0df 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 119 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index e2fe8a26b..169b0b7a4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 120 .byte 29 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 8ce68732c..ba4cccfd5 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse: @ 8483E50 .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 121 .byte 29 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index a7564b752..4d135e0b6 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -3,7 +3,7 @@ Route115: @ 8482800 .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 31 .byte 30 .byte 0 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 291cea02b..27009ad3f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -3,7 +3,7 @@ Route116: @ 848281C .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 32 .byte 31 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 44707b27d..489c5a8b9 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 122 .byte 31 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 35e03215a..d92b96e30 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -3,7 +3,7 @@ Route117: @ 8482838 .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 33 .byte 32 .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 6d586358e..1ace346b5 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -3,7 +3,7 @@ Route117_PokemonDayCare: @ 8483E88 .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 123 .byte 32 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index fe01c71cb..5567df47f 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -3,7 +3,7 @@ Route118: @ 8482854 .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections - .2byte BGM_ROUTE_118 + .2byte MUS_ROUTE_118 .2byte 34 .byte 33 .byte 0 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index e58aae1a8..17d13f572 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -3,7 +3,7 @@ Route119: @ 8482870 .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 35 .byte 34 .byte 0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index c609c06ff..86f968efc 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -3,7 +3,7 @@ Route119_House: @ 8485D28 .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 868b28371..1f555389a 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 271 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index d93617bfc..048ccbf77 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 272 .byte 34 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 5b67adea4..ab7022f9c 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -3,7 +3,7 @@ Route120: @ 848288C .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 36 .byte 35 .byte 0 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index ac6277e86..5347f6d3d 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -3,7 +3,7 @@ Route121: @ 84828A8 .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 37 .byte 36 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index cc17751f8..3ce3d22e7 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 124 .byte 36 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 5c8926df4..f4856b8ab 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -3,7 +3,7 @@ Route122: @ 84828C4 .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections - .2byte BGM_DOORO_X4 + .2byte MUS_DOORO_X4 .2byte 38 .byte 37 .byte 0 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 8c240ba9d..ff3ab332f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -3,7 +3,7 @@ Route123: @ 84828E0 .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections - .2byte BGM_DOORO_X4 + .2byte MUS_DOORO_X4 .2byte 39 .byte 38 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index d25fea9b1..f086368ad 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -3,7 +3,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 38 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index bdd54bf00..e4c690104 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -3,7 +3,7 @@ Route124: @ 84828FC .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 40 .byte 39 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 438ceff8a..d277004eb 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 301 .byte 39 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 6f81fee85..09afc815f 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -3,7 +3,7 @@ Route125: @ 8482918 .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 41 .byte 40 .byte 0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 679d16cfe..f87efc723 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -3,7 +3,7 @@ Route126: @ 8482934 .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 42 .byte 41 .byte 0 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 2ed691c4d..070f9996f 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -3,7 +3,7 @@ Route127: @ 8482950 .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 43 .byte 42 .byte 0 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 976bedb11..01d1a46ba 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -3,7 +3,7 @@ Route128: @ 848296C .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 44 .byte 43 .byte 0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 68221e873..4e5b177df 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -3,7 +3,7 @@ Route129: @ 8482988 .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 45 .byte 44 .byte 0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index de1acbc4a..f4e1f3292 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -3,7 +3,7 @@ Route130: @ 84829A4 .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 263 .byte 45 .byte 0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 38769c3e3..44a8921ba 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -3,7 +3,7 @@ Route131: @ 84829C0 .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 47 .byte 46 .byte 0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index bcb699543..df2aadbfa 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -3,7 +3,7 @@ Route132: @ 84829DC .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 48 .byte 47 .byte 0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 070113974..30a69f94d 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -3,7 +3,7 @@ Route133: @ 84829F8 .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 49 .byte 48 .byte 0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 4dac7fca7..9730f5036 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -3,7 +3,7 @@ Route134: @ 8482A14 .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 50 .byte 49 .byte 0 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index cdff5a143..9698b81de 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -3,7 +3,7 @@ RustboroCity: @ 848250C .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 4 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 95ce57873..e7b936a19 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -3,7 +3,7 @@ RustboroCity_CuttersHouse: @ 8483478 .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 98 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 68391354e..68b72454f 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 92 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 83a317006..5e4dc392b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 93 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 4c40570f6..54ae910d3 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 269 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index b3bba8806..ede158338 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat1_1F: @ 8483424 .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 313 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 2f17773b4..c1a83cdbb 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat1_2F: @ 8483440 .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 314 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 933ce6a3c..14d40b97a 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 294 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index aa2176400..989069c30 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_2F: @ 84834CC .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 295 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index c173ac577..d531fcf98 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 296 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 0eedfdd09..4b49e1077 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -3,7 +3,7 @@ RustboroCity_Gym: @ 8483398 .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 94 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index c07cc459a..49445724b 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -3,7 +3,7 @@ RustboroCity_House1: @ 848345C .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 97 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 14dabb2e8..ec04d74d9 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -3,7 +3,7 @@ RustboroCity_House2: @ 8483494 .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 6d1c4dfd4..9ffe65113 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -3,7 +3,7 @@ RustboroCity_House3: @ 8483504 .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 28751a53f..be134394a 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -3,7 +3,7 @@ RustboroCity_Mart: @ 8483408 .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 0069de670..fb88549f7 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 328472b06..0acf68eaa 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 03b02a3fa..a3d257cfb 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 - .2byte BGM_P_SCHOOL + .2byte MUS_P_SCHOOL .2byte 95 .byte 10 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 95a3c66e7..0ce8c9e12 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -3,7 +3,7 @@ RusturfTunnel: @ 8483F30 .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 129 .byte 60 .byte 0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 48ef241d3..606d682ba 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -3,7 +3,7 @@ SSTidalCorridor: @ 8484F0C .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 277 .byte 87 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index b872e0cf8..c1f883c84 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck: @ 8484F28 .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 278 .byte 87 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 94af1030f..09bfb8652 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -3,7 +3,7 @@ SSTidalRooms: @ 8484F44 .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 279 .byte 87 .byte 0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 76b8f7152..ce05b1eea 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -3,7 +3,7 @@ SafariZone_North: @ 8485158 .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 239 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 714277457..e5efff7b6 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -3,7 +3,7 @@ SafariZone_Northeast: @ 848528C .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 394 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 508e33d1c..810826106 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -3,7 +3,7 @@ SafariZone_Northwest: @ 848513C .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 238 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 855f01fcc..591de9fc1 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -3,7 +3,7 @@ SafariZone_RestHouse: @ 8485270 .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 329 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 5d122f051..58239408f 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -3,7 +3,7 @@ SafariZone_South: @ 8485190 .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 241 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 363185203..56e8aa094 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -3,7 +3,7 @@ SafariZone_Southeast: @ 84852A8 .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 395 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index df20045e8..3eaf59e98 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -3,7 +3,7 @@ SafariZone_Southwest: @ 8485174 .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 240 .byte 57 .byte 0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 35c7edf64..e9b0a7b7e 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -3,7 +3,7 @@ ScorchedSlab: @ 84846BC .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 311 .byte 80 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 3a3345b39..be05d04fa 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Entrance: @ 84841B4 .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 147 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index ac61c156a..094095d7e 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room1: @ 84841D0 .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 148 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 2e2a6c1a1..ebbfc58bc 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room2: @ 84841EC .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 149 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 234f0a1a5..56dd1c14b 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room3: @ 8484208 .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 150 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 4aaf9b62e..1f710ac3a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room4: @ 8484224 .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 151 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 992d9d1c8..8f9edd756 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room5: @ 8484240 .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 152 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 765350afe..e1aab7b08 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room6: @ 848425C .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 153 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index e19e0081b..fd0b49c93 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room7: @ 8484278 .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 154 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 1c4837e72..a5ecc196a 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room8: @ 8484294 .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 155 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index bee6c2698..4df3870e6 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room9: @ 84842B0 .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 156 .byte 68 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index a2909fc7b..87b73cfa1 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom: @ 84846A0 .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 304 .byte 78 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index e9b20d93a..fc55dd8d2 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -3,7 +3,7 @@ SealedChamber_OuterRoom: @ 8484684 .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 284 .byte 78 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index ec497b053..8914ffdc5 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave1: @ 8484AC8 .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 199 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 455db2db0..e36e3dc8e 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave2: @ 8484B70 .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 205 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 77b59cd5e..a1cbd4c33 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave3: @ 8484C18 .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 211 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index db27e5889..4fb353150 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave4: @ 8484CC0 .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 217 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 8da685a13..57f27c823 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave1: @ 8484AAC .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 198 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 08f93827a..3c8bf24d7 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave2: @ 8484B54 .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 204 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 5515ea8c5..78ebb6fd8 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave3: @ 8484BFC .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 210 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d90a89a5f..4d92c301c 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave4: @ 8484CA4 .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 216 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 46fc40ff0..8e730661d 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave1: @ 8484A90 .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 197 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 073a4f6ce..b86e69ecf 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave2: @ 8484B38 .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 203 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index d8748e2f7..9d4f26d36 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave3: @ 8484BE0 .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 209 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 2ae9e38f6..163780567 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave4: @ 8484C88 .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 215 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 0998b2f0d..8f5fd7198 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub1: @ 8484B1C .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 202 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 1223a4105..77b3ae833 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub2: @ 8484BC4 .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 208 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 9d5a06e39..7fb14ec94 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub3: @ 8484C6C .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 214 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 5fcd719b9..10a4d4ca4 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub4: @ 8484D14 .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 220 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index c5142cdba..157173fbb 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree1: @ 8484B00 .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 201 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index bcb5e0f23..6708af92b 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree2: @ 8484BA8 .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 207 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 66dfc9803..fd0c56856 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree3: @ 8484C50 .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 213 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 8d4d0f3df..c2f0b3350 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree4: @ 8484CF8 .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 219 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index c4df84edf..77a446dbd 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave1: @ 8484AE4 .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 200 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index a690ef3fe..ae9200fc1 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave2: @ 8484B8C .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 206 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 60176b1e3..d63751987 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave3: @ 8484C34 .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 212 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 75a76dd44..1a5c43da5 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave4: @ 8484CDC .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 218 .byte 86 .byte 0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index f542d0700..5694fead4 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 168 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 7c4a7184c..a6fd687b2 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 169 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 6065466dc..b109f1f4b 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 164 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 10f4aff16..6a34db69e 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 328 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 5b9972258..cf40979a5 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 165 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index d2c2bcac6..abc2554de 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 167 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 035ab6dcb..aff87bf3d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 166 .byte 67 .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index b4844d42f..d5be84526 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -3,7 +3,7 @@ SingleBattleColosseum: @ 8484D30 .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 221 .byte 87 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 937aafc96..4ec895011 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -3,7 +3,7 @@ SkyPillar_1F: @ 8484764 .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 322 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index cec94c7a2..acdc054e4 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -3,7 +3,7 @@ SkyPillar_2F: @ 8484780 .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 323 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 5dd2b53b3..21ac1c545 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -3,7 +3,7 @@ SkyPillar_3F: @ 848479C .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 324 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 9e89a6177..977442c27 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -3,7 +3,7 @@ SkyPillar_4F: @ 84847B8 .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 325 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 363e2a52e..1df2963b5 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -3,7 +3,7 @@ SkyPillar_5F: @ 84847F0 .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 330 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 5db53ba25..b6b697d46 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -3,7 +3,7 @@ SkyPillar_Entrance: @ 848472C .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 320 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index fc7ed3110..49c5c14e1 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -3,7 +3,7 @@ SkyPillar_Outside: @ 8484748 .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 321 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 3169183ed..97fb4edf4 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -3,7 +3,7 @@ SkyPillar_Top: @ 848480C .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 331 .byte 85 .byte 0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 36ac643e4..0ff430ff2 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -3,7 +3,7 @@ SlateportCity: @ 84824D4 .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 2 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index c5f983ce1..4245201fb 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -3,7 +3,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .4byte SlateportCity_BattleTentBattleRoom_MapEvents .4byte SlateportCity_BattleTentBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 386 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 0ae84307c..f399ab26d 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -3,7 +3,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .4byte SlateportCity_BattleTentCorridor_MapEvents .4byte SlateportCity_BattleTentCorridor_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 385 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 2e35d23c4..4a654fd25 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -3,7 +3,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .4byte SlateportCity_BattleTentLobby_MapEvents .4byte SlateportCity_BattleTentLobby_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 384 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 7f932a556..ca013f6f2 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor: @ 84831D8 .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 88 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 049d9de6c..a5cf37a59 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -3,7 +3,7 @@ SlateportCity_House1: @ 8483168 .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 80 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index f09479db2..1c1ed9f6a 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -3,7 +3,7 @@ SlateportCity_House2: @ 84831F4 .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 60 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index f9db75bdd..8b0bd21a3 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -3,7 +3,7 @@ SlateportCity_Mart: @ 8483248 .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 3c55de12c..b5be36774 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 - .2byte BGM_FUNE_KAN + .2byte MUS_FUNE_KAN .2byte 86 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index c1e082d69..6d9439419 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 - .2byte BGM_FUNE_KAN + .2byte MUS_FUNE_KAN .2byte 87 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index e12c994c1..c19ff9c4b 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 2a810add5..345e8632a 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index ac7230cd2..70d0dc41c 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 85 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index baa482aa3..f30894e60 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 81 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e3fe0fa27..c409b3df7 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 82 .byte 8 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index b0bc91968..cb8f65244 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -3,7 +3,7 @@ SootopolisCity: @ 848257C .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 8 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index dbe7528ea..b17a271d8 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 109 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 1e9618d01..5473a347b 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 110 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index eb3dd5484..8359334d0 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House1: @ 8483AB4 .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 307 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 2a3d57175..3cd04937a 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House2: @ 8483AD0 .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index b4171f3c0..c3ee80da0 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House3: @ 8483AEC .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index ee68a0a91..9d610b9a1 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House4: @ 8483B08 .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 307 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 6a7380b8c..29157d4df 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House5: @ 8483B24 .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index f870ecd91..c05d23e64 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House6: @ 8483B40 .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index f36b89b46..3f02bdcc5 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House7: @ 8483B5C .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 307 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 29e492dcd..0ceade178 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -3,7 +3,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 297 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index fab473720..3b4aaa171 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Mart: @ 8483A98 .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 05d5d727d..72e09b813 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 439 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 603fdcc70..d4497b3e9 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 440 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index bc0c30b7f..28fdf23bd 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 465bf4c74..97000d2b7 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 14 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index e2d44b2ff..700a6cf00 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior: @ 8485238 .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 290 .byte 73 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index dae14dddc..a7b9f14a0 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -3,7 +3,7 @@ SouthernIsland_Interior: @ 8485254 .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 291 .byte 73 .byte 0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 8297d8e34..419388afa 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -3,7 +3,7 @@ TerraCave_End: @ 8484A3C .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 409 .byte 205 .byte 0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 72b3327cd..f0e4df143 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -3,7 +3,7 @@ TerraCave_Entrance: @ 8484A20 .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 408 .byte 205 .byte 0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index ac6089b68..757b3f0a4 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -3,7 +3,7 @@ TradeCenter: @ 8484D4C .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 222 .byte 87 .byte 0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index ab6263ebf..7c6a4ea0e 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -3,7 +3,7 @@ TrainerHill_1F: @ 84857E8 .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 415 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 3751d7207..d9a6d6204 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -3,7 +3,7 @@ TrainerHill_2F: @ 8485804 .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 416 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index edbe1db0e..c88a11d6d 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -3,7 +3,7 @@ TrainerHill_3F: @ 8485820 .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 417 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index de5b03b69..6122362b6 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -3,7 +3,7 @@ TrainerHill_4F: @ 848583C .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 418 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 30ea4f5c4..9d1227640 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -3,7 +3,7 @@ TrainerHill_Elevator: @ 8485ADC .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 266 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 3c43ad0ba..eae0676da 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -3,7 +3,7 @@ TrainerHill_Entrance: @ 84857CC .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 414 .byte 212 .byte 0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index f00fc60bd..3754fc21a 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -3,7 +3,7 @@ TrainerHill_Roof: @ 8485858 .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 419 .byte 212 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 22466247a..2c7de8477 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -3,7 +3,7 @@ Underwater1: @ 8482A30 .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 274 .byte 50 .byte 0 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 21e0953f1..1f29f52f9 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -3,7 +3,7 @@ Underwater2: @ 8482A4C .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 51 .byte 51 .byte 0 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 29e20952f..108251489 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -3,7 +3,7 @@ Underwater3: @ 8482A68 .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 52 .byte 52 .byte 0 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index f7b962a3c..38885bcb7 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -3,7 +3,7 @@ Underwater4: @ 8482A84 .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 53 .byte 53 .byte 0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 5eb11436f..f46d3d677 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -3,7 +3,7 @@ Underwater5: @ 8482AA0 .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 412 .byte 208 .byte 0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index b67c27d7c..cf6ab9141 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -3,7 +3,7 @@ Underwater6: @ 8482ABC .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 410 .byte 206 .byte 0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 942b0cad2..0a55ab00b 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -3,7 +3,7 @@ Underwater7: @ 8482AD8 .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 411 .byte 207 .byte 0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index d995a2dec..6dee9d77a 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -3,7 +3,7 @@ Underwater_MarineCave: @ 84849CC .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 406 .byte 204 .byte 0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 461804c39..c00017cec 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -3,7 +3,7 @@ Underwater_Route134: @ 848464C .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 282 .byte 79 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 88cb213b5..e10d30013 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -3,7 +3,7 @@ Underwater_SeafloorCavern: @ 8484198 .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 146 .byte 69 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index a066b9b35..54362aea4 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -3,7 +3,7 @@ Underwater_SealedChamber: @ 8484668 .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 283 .byte 79 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index a9b7d47ef..af57b3c8d 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -3,7 +3,7 @@ Underwater_SootopolisCity: @ 8483F4C .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 130 .byte 54 .byte 0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index d4394409b..d0b38c071 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -3,7 +3,7 @@ UnionRoom: @ 8485120 .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 393 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 5d41f19b4..4fa500e7e 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_29: @ 8484DBC .4byte UnknownMap_25_29_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 226 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index eeda527bb..38600bb68 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte UnknownMap_25_30_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 227 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 8a81bc212..f53d3055b 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte UnknownMap_25_31_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 228 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 1feace438..0e269a53c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_32: @ 8484E10 .4byte UnknownMap_25_32_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 229 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 8e8ee5f5a..6a8df64c6 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_33: @ 8484E2C .4byte UnknownMap_25_33_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 230 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c259c8ce4..d37b7ceaa 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_34: @ 8484E48 .4byte UnknownMap_25_34_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 231 .byte 87 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index e722ba29a..49be64155 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -3,7 +3,7 @@ VerdanturfTown: @ 8482640 .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 15 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 77d136446..fba5c3764 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 387 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 6446f1eff..5d8bccc99 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 385 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 90cdc086f..6b998c218 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 384 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 2879abaee..6666d264d 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 60 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 00697e511..a1e99f984 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_House: @ 8482F38 .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 59 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 4180e5487..3b5c3cce5 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_Mart: @ 8482EAC .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 6cb39c856..d6fc48171 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 70d6bd938..fa99aeaa4 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 65faba437..a1e4e49aa 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 76 .byte 5 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index a3e196501..8bd8286b5 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_1F: @ 8484374 .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 163 .byte 70 .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 827ada340..620dbdc71 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_B1F: @ 8484390 .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 285 .byte 70 .byte 1 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 45576de02..ebafcfd49 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_B2F: @ 84843AC .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 286 .byte 70 .byte 1 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ebe7b9e0b..2828036e0 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -119,7 +119,7 @@ Route102_EventScript_274448:: @ 8274448 special sub_80EED34 special FieldObjectInteractionRemoveBerryTree message Route102_Text_27461B - playfanfare BGM_ME_KINOMI + playfanfare MUS_ME_KINOMI waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index bfe87dfc2..7eb12ac1f 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -891,7 +891,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 setvar VAR_0x4009, 1 showcontestresults setvar VAR_0x4009, 0 - playbgm BGM_CON_FAN, 0 + playbgm MUS_CON_FAN, 0 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB @@ -1239,7 +1239,7 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_27BBD4, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LinkContestRoom1_Text_27BC00, 4 waitfanfare special sub_80F8390 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7074951d7..d20cfa799 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_291C83:: @ 8291C83 Route117_EventScript_291C9D:: @ 8291C9D message Route117_Text_2921A4 - playfanfare BGM_FANFA1 + playfanfare MUS_FANFA1 waitfanfare waitbuttonpress msgbox Route117_Text_2921CF, 4 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index c56eaf7a0..f666be180 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -141,7 +141,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon @@ -364,7 +364,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare @@ -408,7 +408,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index cadc4c324..f5d2f0005 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -455,7 +455,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare @@ -494,7 +494,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index 90f80ca4a..eab5bce02 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -247,7 +247,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index 7462059ca..45b8be7be 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -174,7 +174,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleFactoryBattleRoom_Text_25B460 waitmessage waitfanfare @@ -210,7 +210,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleFactoryBattleRoom_Text_25B640 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 357bae3e6..f9806de9b 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -70,7 +70,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 16 special sub_81A5E74 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon setvar VAR_0x8004, 9 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 3b664066f..43b9f6f17 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon @@ -272,7 +272,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC waitmessage waitfanfare @@ -315,7 +315,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_250699 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 5589bf59d..36b761e22 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -87,7 +87,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 lock faceplayer msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 @@ -166,7 +166,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 waitmessage - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 waitmessage waitfanfare @@ -201,7 +201,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 waitmessage - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 waitmessage waitfanfare @@ -236,14 +236,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end @@ -255,7 +255,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E waitmovement 0 message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6 waitmessage - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 @@ -611,7 +611,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 closemessage diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index f605f65a2..97232ea36 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 - playbgm BGM_BATTLE_PYRAMID, 0 + playbgm MUS_PYRAMID, 0 setvar VAR_0x400E, 1 end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index f10606ded..6c44e0044 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -59,7 +59,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 setvar VAR_0x400E, 1 end @@ -102,7 +102,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 waitmovement 0 message BattleFrontier_BattlePyramidTop_Text_2554E8 waitmessage - playfanfare BGM_ME_BATTLE_POINTS + playfanfare MUS_ME_POINTGET waitfanfare closemessage @@ -159,7 +159,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 @@ -170,7 +170,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare @@ -206,7 +206,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 @@ -217,7 +217,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 52d31065e..ba111f080 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -82,7 +82,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon @@ -310,7 +310,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare @@ -344,7 +344,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 184b3e820..01f427aaf 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -159,7 +159,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special sub_81A1780 compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index 37079d599..9accdb8ea 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -94,7 +94,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index 1448904d8..7ecf83788 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -29,7 +29,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 7d521e6df..afaf9a605 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -73,7 +73,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 dofieldeffect 65 - playbgm BGM_FRLG_DEOXYS_EYE, 0 + playbgm MUS_RG_DEOEYE, 0 waitfieldeffect 65 addobject 2 applymovement 2, BirthIsland_Exterior_Movement_268054 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index b5b7c603c..6acd67792 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -182,7 +182,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC855 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox DewfordTown_Gym_Text_1FD1E0, 4 waitfanfare closemessage diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 15e03f092..f8dab1f3b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 step_end EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 - playbgm BGM_DAIGO, 0 + playbgm MUS_DAIGO, 0 msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 end EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC - playbgm BGM_GIRL_SUP, 0 + playbgm MUS_GIRL_SUP, 0 return EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 - playbgm BGM_BOY_SUP, 0 + playbgm MUS_BOY_SUP, 0 return EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 8d42978d9..a5274bbe5 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 faceplayer checkflag FLAG_0x4FE goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index ccca35370..e05b82e2e 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 faceplayer checkflag FLAG_0x4FD goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index e26763e2f..b838cc25b 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB faceplayer checkflag FLAG_0x4FC goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 910523a87..63817688d 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -65,7 +65,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 waitmovement 0 delay 10 - playfanfare BGM_ME_BACHI + playfanfare MUS_ME_BACHI message EverGrandeCity_PokemonLeague_1F_Text_2297EF waitmessage waitfanfare diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 405ffcfd6..46c471e4e 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -50,7 +50,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 faceplayer checkflag FLAG_0x4FB goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 12eff183b..6277a9050 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -108,7 +108,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 9fcc21667..347c55659 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -70,7 +70,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 special sub_81A1780 message FallarborTown_BattleTentLobby_Text_2C4F69 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 closemessage diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index e9b9174a8..fc069a8ee 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -38,7 +38,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD call FortreeCity_Gym_EventScript_21666A closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox FortreeCity_Gym_Text_217044, 4 waitfanfare closemessage diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index c913c53a3..9d61bc1a5 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -15,7 +15,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 waitfanfare closemessage diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 965036dfb..0631a5d33 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -98,17 +98,17 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF removeobject 7 setvar VAR_0x4053, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end LavaridgeTown_EventScript_1EA630:: @ 81EA630 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return LavaridgeTown_EventScript_1EA635:: @ 81EA635 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A @@ -258,7 +258,7 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 goto_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, 4 setflag FLAG_0x10A - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 waitfanfare giveegg SPECIES_WYNAUT diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 6c927be40..cd34c3d81 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -87,7 +87,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 waitfanfare closemessage diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b29953d13..87a129620 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -247,7 +247,7 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE end LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 checkflag FLAG_0x11E call_if 1, LilycoveCity_EventScript_1E2E48 checkflag FLAG_0x11E @@ -272,13 +272,13 @@ LilycoveCity_EventScript_1E2E51:: @ 81E2E51 LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A setflag FLAG_0x11E msgbox LilycoveCity_Text_1E318D, 4 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm release end LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 checkflag FLAG_0x11E call_if 1, LilycoveCity_EventScript_1E2EBB checkflag FLAG_0x11E @@ -303,7 +303,7 @@ LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD setflag FLAG_0x11E msgbox LilycoveCity_Text_1E36BF, 4 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm release end @@ -413,7 +413,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 delay 15 removeobject VAR_LAST_TALKED waitfieldeffect 30 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm setflag FLAG_0x124 release diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 0364d8127..3b7d6a2f2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -92,7 +92,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_21B094, 4 @@ -266,7 +266,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_21B094, 4 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 1e9f9cc28..ed34cd953 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 setflag FLAG_0x002 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0b677028d..19471d2e1 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -43,7 +43,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 - playfanfare BGM_ME_WASURE + playfanfare MUS_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 releaseall diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index c7376e394..e60eccbaa 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -918,7 +918,7 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686 LittlerootTown_EventScript_1E8693:: @ 81E8693 msgbox LittlerootTown_Text_1E87F0, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare setflag FLAG_0x112 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 45f57262b..112311462 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -153,7 +153,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 waitmovement 0 compare VAR_0x8008, 1 call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C compare VAR_0x8008, 1 @@ -176,7 +176,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 23d30545c..f1763753a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -73,7 +73,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A waitmovement 0 delay 10 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 compare VAR_FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 compare VAR_FACING, 1 @@ -86,7 +86,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 setflag FLAG_0x331 clearflag FLAG_0x2F8 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 92f4a58e0..2fdf79b03 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B waitmovement 0 compare VAR_0x8008, 1 call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 compare VAR_0x8008, 1 @@ -215,7 +215,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 963ce9880..3a983cdd4 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -74,7 +74,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A waitmovement 0 delay 10 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, 2 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA compare VAR_FACING, 1 @@ -87,7 +87,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A setflag FLAG_0x332 clearflag FLAG_0x2D2 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 9e2ac5197..433db24d2 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -96,7 +96,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_1FA74D waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 compare VAR_RESULT, 1 @@ -184,7 +184,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB436 waitmessage waitfanfare @@ -469,7 +469,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F end LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 waitmessage waitfanfare @@ -517,7 +517,7 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 msgbox Route101_Text_2B5F52, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route101_Text_2B603A, 4 waitfanfare closemessage @@ -568,7 +568,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 waitfanfare setflag FLAG_SYS_POKEDEX_GET diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc index bf96fbb7d..cb0580580 100644 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ b/data/scripts/maps/MagmaHideout_4F.inc @@ -3,7 +3,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_23A560:: @ 823A560 lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 msgbox MagmaHideout_4F_Text_23A9F4, 4 closemessage delay 20 @@ -15,7 +15,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 dofieldeffect 54 waitfieldeffect 54 setvar VAR_RESULT, 1 - playfanfare BGM_ME_TAMA + playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 applymovement 255, MagmaHideout_4F_Movement_2725A6 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 908b3a3b3..1c48e9710 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -462,7 +462,7 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA pokenavcall MauvilleCity_Text_1DFDFB waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MauvilleCity_Text_1DFEB4, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 03d5d5525..94da547d5 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -108,7 +108,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B call MauvilleCity_Gym_EventScript_20DFB1 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MauvilleCity_Gym_Text_20E8B5, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index fd0f0935a..50b218f04 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -16,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 waitmovement 0 delay 30 @@ -45,7 +45,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F addobject 7 addobject 8 addobject 9 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 3443d003d..972d5f4e8 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -82,7 +82,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 call MossdeepCity_Gym_EventScript_22095B closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MossdeepCity_Gym_Text_221AEA, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 918b186ec..91bf06c48 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -121,7 +121,7 @@ MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB bufferspeciesname 1, SPECIES_BELDUM removeobject 2 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message MossdeepCity_StevensHouse_Text_222BED waitmessage waitfanfare diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 107cda58d..e445fc23f 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -35,7 +35,7 @@ MtChimney_EventScript_22EE02:: @ 822EE02 MtChimney_EventScript_22EE0B:: @ 822EE0B lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, 4 applymovement 2, MtChimney_Movement_27259E waitmovement 0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 874c4122a..fed63f0e0 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,7 +31,7 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 end MtPyre_Summit_EventScript_23203C:: @ 823203C - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 255, MtPyre_Summit_Movement_2725B2 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725AA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index d627a1632..3c075cad0 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC checkflag FLAG_0x001 goto_eq OldaleTown_EventScript_1E8FB9 setflag FLAG_0x001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 msgbox OldaleTown_Text_1E91C0, 4 closemessage switch VAR_FACING diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 198c46cf1..1f6de9966 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307 PetalburgCity_EventScript_1DC30F:: @ 81DC30F setflag FLAG_SPECIAL_FLAG_0x4000 - savebgm BGM_TSURETEK + savebgm MUS_TSURETEK return PetalburgCity_EventScript_1DC316:: @ 81DC316 @@ -260,7 +260,7 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, PetalburgCity_Movement_27259E waitmovement 0 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 playse SE_PIN applymovement 8, PetalburgCity_Movement_272598 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 5eb82c2be..c07b89eec 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -206,7 +206,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC msgbox PetalburgCity_Gym_Text_205B0F, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C78 compare VAR_0x8008, 1 @@ -491,7 +491,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 msgbox PetalburgCity_Gym_Text_2063CA, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_205041 compare VAR_0x8008, 2 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c70b3fc1c..5afb12d68 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -8,7 +8,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 msgbox PetalburgWoods_Text_22E3AA, 4 @@ -45,7 +45,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 msgbox PetalburgWoods_Text_22E3AA, 4 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 32312d9ac..9c830ecb3 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall - playbgm BGM_EVENT0, 1 + playbgm MUS_EVENT0, 1 msgbox Route101_Text_1EBE8F, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 8493897b1..fa055a971 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -30,7 +30,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, 4 closemessage - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 applymovement 2, Route103_Movement_27259E waitmovement 0 applymovement 2, Route103_Movement_272598 @@ -47,7 +47,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, 4 closemessage - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 applymovement 2, Route103_Movement_27259E waitmovement 0 applymovement 2, Route103_Movement_272598 @@ -146,7 +146,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 setflag FLAG_0x082 setvar VAR_0x40C7, 1 clearflag FLAG_0x3D3 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1fc3b89cc..128888939 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -83,11 +83,11 @@ Route104_EventScript_1ECD11:: @ 81ECD11 return Route104_EventScript_1ECD29:: @ 81ECD29 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route104_EventScript_1ECD2E:: @ 81ECD2E - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route104_EventScript_1ECD33:: @ 81ECD33 @@ -107,7 +107,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B msgbox Route104_Text_1EDBFF, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EDC8F, 4 waitfanfare closemessage @@ -167,7 +167,7 @@ Route104_EventScript_1ECE1C:: @ 81ECE1C end Route104_EventScript_1ECE31:: @ 81ECE31 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -198,7 +198,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F msgbox Route104_Text_1EDF04, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EDFA0, 4 waitfanfare closemessage @@ -395,7 +395,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF pokenavcall Route104_Text_1EE336 waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EE463, 4 waitfanfare closemessage diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 39a4c57d4..210354444 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -16,7 +16,7 @@ Route110_MapScript1_1EF27D: @ 81EF27D end Route110_EventScript_1EF293:: @ 81EF293 - savebgm BGM_CYCLING + savebgm MUS_CYCLING return Route110_MapScript2_1EF297: @ 81EF297 @@ -369,7 +369,7 @@ Route110_EventScript_1EF735:: @ 81EF735 Route110_EventScript_1EF743:: @ 81EF743 setvar VAR_0x40A9, 3 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -417,11 +417,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E end Route110_EventScript_1EF7E1:: @ 81EF7E1 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route110_EventScript_1EF7E6:: @ 81EF7E6 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route110_EventScript_1EF7EB:: @ 81EF7EB @@ -509,7 +509,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC call_if 1, Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end @@ -655,7 +655,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AFF, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route110_Text_1F0C0C, 4 waitfanfare closemessage diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index f71a6a097..580848838 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -723,7 +723,7 @@ Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_26ABE8 waitfanfare msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index bd416f463..3d9914b83 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -264,14 +264,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE Route111_EventScript_1F0FB0:: @ 81F0FB0 setweather 2 - fadenewbgm BGM_DOORO_X1 + fadenewbgm MUS_DOORO_X1 doweather setvar VAR_0x4003, 0 end Route111_EventScript_1F0FBD:: @ 81F0FBD setweather 8 - fadenewbgm BGM_ASHROAD + fadenewbgm MUS_ASHROAD doweather end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 41c74d4a7..53c2c14ff 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -71,11 +71,11 @@ Route119_EventScript_1F4488:: @ 81F4488 end Route119_EventScript_1F4501:: @ 81F4501 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route119_EventScript_1F4506:: @ 81F4506 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route119_EventScript_1F450B:: @ 81F450B @@ -158,7 +158,7 @@ Route119_EventScript_1F460F:: @ 81F460F call_if 1, Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm delay 60 compare VAR_0x4001, 1 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 7d7281e4d..38f79763d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -118,7 +118,7 @@ Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 end Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route119_WeatherInstitute_2F_Text_2706E8 waitmessage waitfanfare diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 74746e16f..c813fe6ac 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -15,7 +15,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F Route121_EventScript_1F5E18:: @ 81F5E18 lockall - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 msgbox Route121_Text_1F605A, 4 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index bfacaaee8..4b60f1428 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -70,7 +70,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_2A5052 waitfanfare msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 5b6d0fe7d..8798a586a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -288,7 +288,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6 RustboroCity_EventScript_1E09CD:: @ 81E09CD msgbox RustboroCity_Text_1E17FE, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 addobject 10 addobject 9 applymovement 10, RustboroCity_Movement_1E0AA0 @@ -689,11 +689,11 @@ RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 return RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return RustboroCity_EventScript_1E0DEE:: @ 81E0DEE - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 @@ -841,7 +841,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B msgbox RustboroCity_Text_1E1A49, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Text_1E1ADB, 4 waitfanfare closemessage @@ -883,7 +883,7 @@ RustboroCity_EventScript_1E10C1:: @ 81E10C1 end RustboroCity_EventScript_1E10D6:: @ 81E10D6 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -914,7 +914,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 msgbox RustboroCity_Text_1E1D7D, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Text_1E1E11, 4 waitfanfare closemessage diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e9765fa56..5543b297a 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -193,7 +193,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 bufferspeciesname 1, SPECIES_LILEEP - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_2122CB waitmessage waitfanfare @@ -242,7 +242,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 bufferspeciesname 1, SPECIES_ANORITH - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_2122CB waitmessage waitfanfare diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 373f4e566..9547fbd67 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 closemessage - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 0cdfaf4b9..1d722b7de 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -100,7 +100,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B pokenavcall RustboroCity_Gym_Text_213A76 waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Gym_Text_213C01, 4 waitfanfare closemessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index cefb978fe..e4e362234 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -311,7 +311,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 lock faceplayer - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox RusturfTunnel_Text_22D20A, 4 trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 msgbox RusturfTunnel_Text_22D2E1, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 984d53295..087459bbb 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_23505C waitmovement 0 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_23505F, 4 closemessage addobject VAR_0x8004 @@ -44,7 +44,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitfieldeffect 54 closemessage setvar VAR_RESULT, 0 - playfanfare BGM_ME_TAMA + playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 @@ -81,7 +81,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, 4 - playse SE_PC_LOGON + playse SE_PC_LOGIN applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 304e4decc..566c37a51 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -70,7 +70,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C msgbox SlateportCity_Text_1DF12B, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox SlateportCity_Text_1DF1A6, 4 waitfanfare closemessage @@ -149,7 +149,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 @@ -586,7 +586,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 msgbox SlateportCity_Text_1DE64F, 4 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, 4 applymovement 6, SlateportCity_Movement_2725A4 applymovement 1, SlateportCity_Movement_2725A4 diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 2c6c979b0..f6c09f9c1 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -63,7 +63,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE setvar VAR_0x8004, 16 special sub_81A5E74 msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 985251556..ca51ab57e 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -69,7 +69,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 special sub_81A1780 message SlateportCity_BattleTentLobby_Text_23F68C waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare goto SlateportCity_BattleTentLobby_EventScript_208861 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index aa8704027..5fb080363 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -16,7 +16,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 return SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 - savebgm BGM_AQA_0 + savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 setflag FLAG_0x389 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 055544fbc..8a7f81f9a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -6,7 +6,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 closemessage - playbgm BGM_AQA_0, 1 + playbgm MUS_AQA_0, 1 addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 waitmovement 0 @@ -59,7 +59,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 closemessage - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm fadescreen 1 removeobject 2 @@ -76,7 +76,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 closemessage fadescreen 1 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon removeobject 1 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 2883c5c2a..a274d1f78 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -546,7 +546,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm BGM_RUNECITY + fadenewbgm MUS_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 warp8 SOOTOPOLIS_CITY, 255, 43, 32 @@ -599,7 +599,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm BGM_NAMINORI + fadenewbgm MUS_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 warp8 SOOTOPOLIS_CITY, 255, 29, 53 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 81bb9b7c2..362ae269c 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -115,7 +115,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 call SootopolisCity_Gym_1F_EventScript_224FD4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox SootopolisCity_Gym_1F_Text_22574D, 4 waitfanfare closemessage diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/scripts/maps/TrainerHill_Roof.inc index d38ef8153..bdec2f7aa 100644 --- a/data/scripts/maps/TrainerHill_Roof.inc +++ b/data/scripts/maps/TrainerHill_Roof.inc @@ -28,7 +28,7 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 TrainerHill_Roof_EventScript_269020:: @ 8269020 msgbox TrainerHill_Roof_Text_268AC5, 4 - playfanfare BGM_FANFA1 + playfanfare MUS_FANFA1 message gUnknown_08272A78 waitfanfare waitmessage diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 32094137a..65f62498e 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -32,23 +32,23 @@ LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF return LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm BGM_TEST1 + savebgm MUS_TEST1 return LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm BGM_TEST2 + savebgm MUS_TEST2 return LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm BGM_TEST3 + savebgm MUS_TEST3 return LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm BGM_TEST4 + savebgm MUS_TEST4 return LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm BGM_CONTEST0 + savebgm MUS_CONTEST0 return LinkContestRoom1_MapScript1_23B803: @ 823B803 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index 44240eb0a..208f9b4d2 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -86,7 +86,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index cd23003c7..a7f496820 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -70,7 +70,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 special sub_81A1780 message VerdanturfTown_BattleTentLobby_Text_24A554 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 closemessage diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index abb8fed2e..6bae599fc 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 - playbgm BGM_INTER_V, 0 + playbgm MUS_INTER_V, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4 closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 - playbgm BGM_INTER_V, 0 + playbgm MUS_INTER_V, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4 closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA @@ -341,7 +341,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4 waitfanfare closemessage diff --git a/data/strings.s b/data/strings.s index ec8acf5fa..3120c8953 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3817,7 +3817,7 @@ gText_WaitForAllChooseBerry:: @ 85ED62C .align 2 gText_EndedWithXUnitsPowder:: @ 85ED65C - .string "{PAUSE_MUSIC}{PLAY_BGM BGM_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p$" + .string "{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p$" .align 2 gText_RecordingGameResults:: @ 85ED6C8 diff --git a/include/constants/songs.h b/include/constants/songs.h index 2e3adcbbf..888922320 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,9 +1,9 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H -#define SE_STOP 0 +#define MUS_DUMMY 0 #define SE_KAIFUKU 1 -#define SE_PC_LOGON 2 +#define SE_PC_LOGIN 2 #define SE_PC_OFF 3 #define SE_PC_ON 4 #define SE_SELECT 5 @@ -52,7 +52,7 @@ #define SE_HI_TURUN 48 #define SE_TRACK_MOVE 49 #define SE_TRACK_STOP 50 -#define SE_TRACK_HAIK 51 +#define SE_TRACK_HAIKI 51 #define SE_TRACK_DOOR 52 #define SE_MOTER 53 #define SE_CARD 54 @@ -249,217 +249,239 @@ #define SE_W287B 245 #define SE_W114 246 #define SE_W063B 247 -#define BGM_STOP 349 -#define BGM_TETSUJI 350 -#define BGM_FIELD13 351 -#define BGM_KACHI22 352 -#define BGM_KACHI2 353 -#define BGM_KACHI3 354 -#define BGM_KACHI5 355 -#define BGM_PCC 356 -#define BGM_NIBI 357 -#define BGM_SUIKUN 358 -#define BGM_DOORO1 359 -#define BGM_DOORO_X1 360 -#define BGM_DOORO_X3 361 -#define BGM_MACHI_S2 362 -#define BGM_MACHI_S4 363 -#define BGM_GIM 364 -#define BGM_NAMINORI 365 -#define BGM_DAN01 366 -#define BGM_FANFA1 367 -#define BGM_ME_ASA 368 -#define BGM_ME_BACHI 369 -#define BGM_FANFA4 370 -#define BGM_FANFA5 371 -#define BGM_ME_WAZA 372 -#define BGM_BIJYUTU 373 -#define BGM_DOORO_X4 374 -#define BGM_FUNE_KAN 375 -#define BGM_ME_SHINKA 376 -#define BGM_SHINKA 377 -#define BGM_ME_WASURE 378 -#define BGM_SYOUJOEYE 379 -#define BGM_BOYEYE 380 -#define BGM_DAN02 381 -#define BGM_MACHI_S3 382 -#define BGM_ODAMAKI 383 -#define BGM_B_TOWER 384 -#define BGM_SWIMEYE 385 -#define BGM_DAN03 386 -#define BGM_ME_KINOMI 387 -#define BGM_ME_TAMA 388 -#define BGM_ME_B_BIG 389 -#define BGM_ME_B_SMALL 390 -#define BGM_ME_ZANNEN 391 -#define BGM_BD_TIME 392 -#define BGM_TEST1 393 -#define BGM_TEST2 394 -#define BGM_TEST3 395 -#define BGM_TEST4 396 -#define BGM_TEST 397 -#define BGM_GOMACHI0 398 -#define BGM_GOTOWN 399 -#define BGM_POKECEN 400 -#define BGM_NEXTROAD 401 -#define BGM_GRANROAD 402 -#define BGM_CYCLING 403 -#define BGM_FRIENDLY 404 -#define BGM_MISHIRO 405 -#define BGM_TOZAN 406 -#define BGM_GIRLEYE 407 -#define BGM_MINAMO 408 -#define BGM_ASHROAD 409 -#define BGM_EVENT0 410 -#define BGM_DEEPDEEP 411 -#define BGM_KACHI1 412 -#define BGM_TITLE3 413 -#define BGM_DEMO1 414 -#define BGM_GIRL_SUP 415 -#define BGM_HAGESHII 416 -#define BGM_KAKKOII 417 -#define BGM_KAZANBAI 418 -#define BGM_AQA_0 419 -#define BGM_TSURETEK 420 -#define BGM_BOY_SUP 421 -#define BGM_RAINBOW 422 -#define BGM_AYASII 423 -#define BGM_KACHI4 424 -#define BGM_ROPEWAY 425 -#define BGM_CASINO 426 -#define BGM_HIGHTOWN 427 -#define BGM_SAFARI 428 -#define BGM_C_ROAD 429 -#define BGM_AJITO 430 -#define BGM_M_BOAT 431 -#define BGM_M_DUNGON 432 -#define BGM_FINECITY 433 -#define BGM_MACHUPI 434 -#define BGM_P_SCHOOL 435 -#define BGM_DENDOU 436 -#define BGM_TONEKUSA 437 -#define BGM_MABOROSI 438 -#define BGM_CON_FAN 439 -#define BGM_CONTEST0 440 -#define BGM_MGM0 441 -#define BGM_T_BATTLE 442 -#define BGM_OOAME 443 -#define BGM_HIDERI 444 -#define BGM_RUNECITY 445 -#define BGM_CON_K 446 -#define BGM_EIKOU_R 447 -#define BGM_KARAKURI 448 -#define BGM_HUTAGO 449 -#define BGM_SITENNOU 450 -#define BGM_YAMA_EYE 451 -#define BGM_CONLOBBY 452 -#define BGM_INTER_V 453 -#define BGM_DAIGO 454 -#define BGM_THANKFOR 455 -#define BGM_END 456 -#define BGM_BATTLE_FRONTIER 457 -#define BGM_BATTLE_ARENA 458 -#define BGM_ME_BATTLE_POINTS 459 -#define BGM_ME_MATCH_CALL 460 -#define BGM_BATTLE_PYRAMID 461 -#define BGM_BATTLE_PYRAMID_SUMMIT 462 -#define BGM_BATTLE_PALACE 463 -#define BGM_FANFA_RAYQUAZA 464 -#define BGM_BATTLE_TOWER 465 -#define BGM_ME_BATTLE_SYMBOL 466 -#define BGM_BATTLE_DOME_TOURNAMENT 467 -#define BGM_BATTLE_PIKE 468 -#define BGM_BATTLE_FACTORY 469 -#define BGM_BATTLE_LEGENDARY 470 -#define BGM_BATTLE_FRONTIER_BRAIN 471 -#define BGM_BATTLE_MEW 472 -#define BGM_BATTLE_DOME 473 -#define BGM_BATTLE27 474 -#define BGM_BATTLE31 475 -#define BGM_BATTLE20 476 -#define BGM_BATTLE32 477 -#define BGM_BATTLE33 478 -#define BGM_BATTLE36 479 -#define BGM_BATTLE34 480 -#define BGM_BATTLE35 481 -#define BGM_BATTLE38 482 -#define BGM_BATTLE30 483 -#define BGM_FRLG_FOLLOW_ME 484 -#define BGM_FRLG_GAMECORNER 485 -#define BGM_FRLG_ROCKET_HIDEOUT 486 -#define BGM_FRLG_GYM 487 -#define BGM_FRLG_JIGGLYPUFF 488 -#define BGM_FRLG_OPENING 489 -#define BGM_FRLG_TITLE 490 -#define BGM_FRLG_CINNABAR_ISLAND 491 -#define BGM_FRLG_LAVENDER_TOWN 492 -#define BGM_FRLG_HEALING_TEST 493 -#define BGM_FRLG_BICYCLE 494 -#define BGM_FRLG_SUSPICIOUS_EYE 495 -#define BGM_FRLG_GIRL_EYE 496 -#define BGM_FRLG_BOY_EYE 497 -#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 498 -#define BGM_FRLG_VIRIDIAN_FOREST 499 -#define BGM_FRLG_MT_MOON 500 -#define BGM_FRLG_POKEMON_MANSION 501 -#define BGM_FRLG_CREDITS 502 -#define BGM_FRLG_ROUTE_1 503 -#define BGM_FRLG_ROUTE_24 504 -#define BGM_FRLG_ROUTE_3 505 -#define BGM_FRLG_ROUTE_11 506 -#define BGM_FRLG_INDIGO_PLATEAU 507 -#define BGM_FRLG_BATTLE_LEADER 508 -#define BGM_FRLG_BATTLE_TRAINER 509 -#define BGM_FRLG_BATTLE_WILD_POKEMON 510 -#define BGM_FRLG_BATTLE_CHAMPION 511 -#define BGM_FRLG_PALLET_TOWN 512 -#define BGM_FRLG_OAK_LAB 513 -#define BGM_FRLG_PROF_OAK 514 -#define BGM_FRLG_POKEMON_CENTER 515 -#define BGM_FRLG_SS_ANNE 516 -#define BGM_FRLG_SURF 517 -#define BGM_FRLG_POKEMON_TOWER 518 -#define BGM_FRLG_SILPH 519 -#define BGM_FRLG_CERULEAN_CITY 520 -#define BGM_FRLG_CELADON_CITY 521 -#define BGM_FRLG_KACHI_TRAINER 522 -#define BGM_FRLG_KACHI_WILD_POKEMON 523 -#define BGM_FRLG_KACHI_LEADER 524 -#define BGM_FRLG_VERMILION_CITY 525 -#define BGM_FRLG_VIRIDIAN_CITY 526 -#define BGM_FRLG_RIVAL 527 -#define BGM_FRLG_RIVAL_POSTBATTLE 528 -#define BGM_FRLG_ME_POKEDEX_EVAL 529 -#define BGM_FRLG_ME_KEYITEM 530 -#define BGM_FRLG_FANFA_POKEMON_CAUGHT 531 -#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 532 -#define BGM_FRLG_GAMEFREAK_LOGO 533 -#define BGM_FRLG_CAUGHT_POKEMON 534 -#define BGM_FRLG_GAME_EXPLANATION_START 535 -#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 536 -#define BGM_FRLG_GAME_EXPLANATION_END 537 -#define BGM_FRLG_POKEMON_JUMP 538 -#define BGM_FRLG_UNION_ROOM 539 -#define BGM_FRLG_POKEMON_NETWORK_CENTER 540 -#define BGM_FRLG_MYSTERY_GIFT 541 -#define BGM_FRLG_DODRIO_BERRY_PICK 542 -#define BGM_FRLG_MT_EMBER 543 -#define BGM_FRLG_TEACHY_TV_EPISODE 544 -#define BGM_FRLG_SEVII_ISLANDS 545 -#define BGM_FRLG_TANOBY_RUINS 546 -#define BGM_FRLG_ISLAND_ONE 547 -#define BGM_FRLG_ISLAND_FOUR 548 -#define BGM_FRLG_ISLAND_SIX 549 -#define BGM_FRLG_FLUTE 550 -#define BGM_FRLG_BATTLE_DEOXYS 551 -#define BGM_FRLG_BATTLE_MEWTWO 552 -#define BGM_FRLG_BATTLE_LEGENDARY 553 -#define BGM_FRLG_LEADER_EYE 554 -#define BGM_FRLG_DEOXYS_EYE 555 -#define BGM_FRLG_TRAINER_TOWER 556 -#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 557 -#define BGM_FRLG_TEACHY_TV 558 +#define SE_RG_W_DOOR 248 +#define SE_RG_CARD1 249 +#define SE_RG_CARD2 250 +#define SE_RG_CARD3 251 +#define SE_RG_BAG1 252 +#define SE_RG_BAG2 253 +#define SE_RG_GETTING 254 +#define SE_RG_SHOP 255 +#define SE_RG_KITEKI 256 +#define SE_RG_HELP_OP 257 +#define SE_RG_HELP_CL 258 +#define SE_RG_HELP_NG 259 +#define SE_RG_DEOMOV 260 +#define SE_RG_EXCELLENT 261 +#define SE_RG_NAWAMISS 262 +#define SE_TOREEYE 263 +#define SE_TOREOFF 264 +#define SE_HANTEI1 265 +#define SE_HANTEI2 266 +#define SE_CURTAIN 267 +#define SE_CURTAIN1 268 +#define SE_USSOKI 269 -#define BGM_ROUTE_118 0x7FFF // What is this for? +#define MUS_TETSUJI 350 +#define MUS_FIELD13 351 +#define MUS_KACHI22 352 +#define MUS_KACHI2 353 +#define MUS_KACHI3 354 +#define MUS_KACHI5 355 +#define MUS_PCC 356 +#define MUS_NIBI 357 +#define MUS_SUIKUN 358 +#define MUS_DOORO1 359 +#define MUS_DOORO_X1 360 +#define MUS_DOORO_X3 361 +#define MUS_MACHI_S2 362 +#define MUS_MACHI_S4 363 +#define MUS_GIM 364 +#define MUS_NAMINORI 365 +#define MUS_DAN01 366 +#define MUS_FANFA1 367 +#define MUS_ME_ASA 368 +#define MUS_ME_BACHI 369 +#define MUS_FANFA4 370 +#define MUS_FANFA5 371 +#define MUS_ME_WAZA 372 +#define MUS_BIJYUTU 373 +#define MUS_DOORO_X4 374 +#define MUS_FUNE_KAN 375 +#define MUS_ME_SHINKA 376 +#define MUS_SHINKA 377 +#define MUS_ME_WASURE 378 +#define MUS_SYOUJOEYE 379 +#define MUS_BOYEYE 380 +#define MUS_DAN02 381 +#define MUS_MACHI_S3 382 +#define MUS_ODAMAKI 383 +#define MUS_B_TOWER 384 +#define MUS_SWIMEYE 385 +#define MUS_DAN03 386 +#define MUS_ME_KINOMI 387 +#define MUS_ME_TAMA 388 +#define MUS_ME_B_BIG 389 +#define MUS_ME_B_SMALL 390 +#define MUS_ME_ZANNEN 391 +#define MUS_BD_TIME 392 +#define MUS_TEST1 393 +#define MUS_TEST2 394 +#define MUS_TEST3 395 +#define MUS_TEST4 396 +#define MUS_TEST 397 +#define MUS_GOMACHI0 398 +#define MUS_GOTOWN 399 +#define MUS_POKECEN 400 +#define MUS_NEXTROAD 401 +#define MUS_GRANROAD 402 +#define MUS_CYCLING 403 +#define MUS_FRIENDLY 404 +#define MUS_MISHIRO 405 +#define MUS_TOZAN 406 +#define MUS_GIRLEYE 407 +#define MUS_MINAMO 408 +#define MUS_ASHROAD 409 +#define MUS_EVENT0 410 +#define MUS_DEEPDEEP 411 +#define MUS_KACHI1 412 +#define MUS_TITLE3 413 +#define MUS_DEMO1 414 +#define MUS_GIRL_SUP 415 +#define MUS_HAGESHII 416 +#define MUS_KAKKOII 417 +#define MUS_KAZANBAI 418 +#define MUS_AQA_0 419 +#define MUS_TSURETEK 420 +#define MUS_BOY_SUP 421 +#define MUS_RAINBOW 422 +#define MUS_AYASII 423 +#define MUS_KACHI4 424 +#define MUS_ROPEWAY 425 +#define MUS_CASINO 426 +#define MUS_HIGHTOWN 427 +#define MUS_SAFARI 428 +#define MUS_C_ROAD 429 +#define MUS_AJITO 430 +#define MUS_M_BOAT 431 +#define MUS_M_DUNGON 432 +#define MUS_FINECITY 433 +#define MUS_MACHUPI 434 +#define MUS_P_SCHOOL 435 +#define MUS_DENDOU 436 +#define MUS_TONEKUSA 437 +#define MUS_MABOROSI 438 +#define MUS_CON_FAN 439 +#define MUS_CONTEST0 440 +#define MUS_MGM0 441 +#define MUS_T_BATTLE 442 +#define MUS_OOAME 443 +#define MUS_HIDERI 444 +#define MUS_RUNECITY 445 +#define MUS_CON_K 446 +#define MUS_EIKOU_R 447 +#define MUS_KARAKURI 448 +#define MUS_HUTAGO 449 +#define MUS_SITENNOU 450 +#define MUS_YAMA_EYE 451 +#define MUS_CONLOBBY 452 +#define MUS_INTER_V 453 +#define MUS_DAIGO 454 +#define MUS_THANKFOR 455 +#define MUS_END 456 +#define MUS_B_FRONTIER 457 +#define MUS_B_ARENA 458 +#define MUS_ME_POINTGET 459 +#define MUS_ME_TORE_EYE 460 +#define MUS_PYRAMID 461 +#define MUS_PYRAMID_TOP 462 +#define MUS_B_PALACE 463 +#define MUS_REKKUU_KOURIN 464 +#define MUS_SATTOWER 465 +#define MUS_ME_SYMBOLGET 466 +#define MUS_B_DOME 467 +#define MUS_B_TUBE 468 +#define MUS_B_FACTORY 469 +#define MUS_VS_REKKU 470 +#define MUS_VS_FRONT 471 +#define MUS_VS_MEW 472 +#define MUS_B_DOME1 473 +#define MUS_BATTLE27 474 +#define MUS_BATTLE31 475 +#define MUS_BATTLE20 476 +#define MUS_BATTLE32 477 +#define MUS_BATTLE33 478 +#define MUS_BATTLE36 479 +#define MUS_BATTLE34 480 +#define MUS_BATTLE35 481 +#define MUS_BATTLE38 482 +#define MUS_BATTLE30 483 +#define MUS_RG_ANNAI 484 +#define MUS_RG_SLOT 485 +#define MUS_RG_AJITO 486 +#define MUS_RG_GYM 487 +#define MUS_RG_PURIN 488 +#define MUS_RG_DEMO 489 +#define MUS_RG_TITLE 490 +#define MUS_RG_GUREN 491 +#define MUS_RG_SHION 492 +#define MUS_RG_KAIHUKU 493 +#define MUS_RG_CYCLING 494 +#define MUS_RG_ROCKET 495 +#define MUS_RG_SHOUJO 496 +#define MUS_RG_SHOUNEN 497 +#define MUS_RG_DENDOU 498 +#define MUS_RG_T_MORI 499 +#define MUS_RG_OTSUKIMI 500 +#define MUS_RG_POKEYASHI 501 +#define MUS_RG_ENDING 502 +#define MUS_RG_LOAD01 503 +#define MUS_RG_OPENING 504 +#define MUS_RG_LOAD02 505 +#define MUS_RG_LOAD03 506 +#define MUS_RG_CHAMP_R 507 +#define MUS_RG_VS_GYM 508 +#define MUS_RG_VS_TORE 509 +#define MUS_RG_VS_YASEI 510 +#define MUS_RG_VS_LAST 511 +#define MUS_RG_MASARA 512 +#define MUS_RG_KENKYU 513 +#define MUS_RG_OHKIDO 514 +#define MUS_RG_POKECEN 515 +#define MUS_RG_SANTOAN 516 +#define MUS_RG_NAMINORI 517 +#define MUS_RG_P_TOWER 518 +#define MUS_RG_SHIRUHU 519 +#define MUS_RG_HANADA 520 +#define MUS_RG_TAMAMUSI 521 +#define MUS_RG_WIN_TRE 522 +#define MUS_RG_WIN_YASEI 523 +#define MUS_RG_WIN_GYM 524 +#define MUS_RG_KUCHIBA 525 +#define MUS_RG_NIBI 526 +#define MUS_RG_RIVAL1 527 +#define MUS_RG_RIVAL2 528 +#define MUS_RG_FAN2 529 +#define MUS_RG_FAN5 530 +#define MUS_RG_FAN6 531 +#define MUS_ME_RG_PHOTO 532 +#define MUS_RG_TITLEROG 533 +#define MUS_RG_GET_YASEI 534 +#define MUS_RG_SOUSA 535 +#define MUS_RG_SEKAIKAN 536 +#define MUS_RG_SEIBETU 537 +#define MUS_RG_JUMP 538 +#define MUS_RG_UNION 539 +#define MUS_RG_NETWORK 540 +#define MUS_RG_OKURIMONO 541 +#define MUS_RG_KINOMIKUI 542 +#define MUS_RG_NANADUNGEON 543 +#define MUS_RG_OSHIE_TV 544 +#define MUS_RG_NANASHIMA 545 +#define MUS_RG_NANAISEKI 546 +#define MUS_RG_NANA123 547 +#define MUS_RG_NANA45 548 +#define MUS_RG_NANA67 549 +#define MUS_RG_POKEFUE 550 +#define MUS_RG_VS_DEO 551 +#define MUS_RG_VS_MYU2 552 +#define MUS_RG_VS_DEN 553 +#define MUS_RG_EXEYE 554 +#define MUS_RG_DEOEYE 555 +#define MUS_RG_T_TOWER 556 +#define MUS_RG_SLOWMASARA 557 +#define MUS_RG_TVNOIZE 558 + +#define MUS_ROUTE_118 0x7FFF // What is this for? #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/songs.h b/include/songs.h deleted file mode 100644 index 37c4f16b4..000000000 --- a/include/songs.h +++ /dev/null @@ -1,466 +0,0 @@ -#ifndef GUARD_SONGS_H -#define GUARD_SONGS_H - -enum -{ - /*0x00*/ SE_STOP, - /*0x01*/ SE_KAIFUKU, - /*0x02*/ SE_PC_LOGON, - /*0x03*/ SE_PC_OFF, - /*0x04*/ SE_PC_ON, - /*0x05*/ SE_SELECT, - /*0x06*/ SE_WIN_OPEN, - /*0x07*/ SE_WALL_HIT, - /*0x08*/ SE_DOOR, - /*0x09*/ SE_KAIDAN, - /*0x0A*/ SE_DANSA, - /*0x0B*/ SE_JITENSYA, - /*0x0C*/ SE_KOUKA_L, // Goggle told me Kouka means 'effectiveness' which makes sense, because - /*0x0D*/ SE_KOUKA_M, // those three sounds play whenever you use a move - /*0x0E*/ SE_KOUKA_H, - /*0x0F*/ SE_BOWA2, - /*0x10*/ SE_POKE_DEAD, - /*0x11*/ SE_NIGERU, - /*0x12*/ SE_JIDO_DOA, - /*0x13*/ SE_NAMINORI, - /*0x14*/ SE_BAN, - /*0x15*/ SE_PIN, - /*0x16*/ SE_BOO, - /*0x17*/ SE_BOWA, - /*0x18*/ SE_JYUNI, - /*0x19*/ SE_A, - /*0x1A*/ SE_I, - /*0x1B*/ SE_U, - /*0x1C*/ SE_E, - /*0x1D*/ SE_O, - /*0x1E*/ SE_N, - /*0x1F*/ SE_SEIKAI, - /*0x20*/ SE_HAZURE, - /*0x21*/ SE_EXP, - /*0x22*/ SE_JITE_PYOKO, - /*0x23*/ SE_MU_PACHI, - /*0x24*/ SE_TK_KASYA, - /*0x25*/ SE_FU_ZAKU, - /*0x26*/ SE_FU_ZAKU2, - /*0x27*/ SE_FU_ZUZUZU, - /*0x28*/ SE_RU_GASHIN, - /*0x29*/ SE_RU_GASYAN, - /*0x2A*/ SE_RU_BARI, - /*0x2B*/ SE_RU_HYUU, - /*0x2C*/ SE_KI_GASYAN, - /*0x2D*/ SE_TK_WARPIN, - /*0x2E*/ SE_TK_WARPOUT, - /*0x2F*/ SE_TU_SAA, - /*0x30*/ SE_HI_TURUN, - /*0x31*/ SE_TRACK_MOVE, - /*0x32*/ SE_TRACK_STOP, - /*0x33*/ SE_TRACK_HAIK, - /*0x34*/ SE_TRACK_DOOR, - /*0x35*/ SE_MOTER, - /*0x36*/ SE_CARD, - /*0x37*/ SE_SAVE, - /*0x38*/ SE_KON, - /*0x39*/ SE_KON2, - /*0x3A*/ SE_KON3, - /*0x3B*/ SE_KON4, - /*0x3C*/ SE_SUIKOMU, - /*0x3D*/ SE_NAGERU, - SE_TOY_C, - SE_TOY_D, - SE_TOY_E, - SE_TOY_F, - SE_TOY_G, - SE_TOY_A, - SE_TOY_B, - SE_TOY_C1, - SE_MIZU, - SE_HASHI, - SE_DAUGI, - SE_PINPON, - SE_FUUSEN1, - SE_FUUSEN2, - SE_FUUSEN3, - SE_TOY_KABE, - SE_TOY_DANGO, - SE_DOKU, - SE_ESUKA, - SE_T_AME, - SE_T_AME_E, - SE_T_OOAME, - SE_T_OOAME_E, - SE_T_KOAME, - SE_T_KOAME_E, - SE_T_KAMI, - SE_T_KAMI2, - SE_ELEBETA, - /*0x5A*/ SE_HINSI, - /*0x5B*/ SE_EXPMAX, - /*0x5C*/ SE_TAMAKORO, - /*0x5D*/ SE_TAMAKORO_E, - /*0x5E*/ SE_BASABASA, - /*0x5F*/ SE_REGI, - SE_C_GAJI, - SE_C_MAKU_U, - SE_C_MAKU_D, - SE_C_PASI, - SE_C_SYU, - SE_C_PIKON, - /*0x66*/ SE_REAPOKE, - /*0x67*/ SE_OP_BASYU, - /*0x68*/ SE_BT_START, - SE_DENDOU, - SE_JIHANKI, - SE_TAMA, - SE_Z_SCROLL, - /*0x6D*/ SE_Z_PAGE, - /*0x6E*/ SE_PN_ON, - /*0x6F*/ SE_PN_OFF, - /*0x70*/ SE_Z_SEARCH, - /*0x71*/ SE_TAMAGO, - /*0x72*/ SE_TB_START, - /*0x73*/ SE_TB_KON, - /*0x74*/ SE_TB_KARA, - /*0x75*/ SE_BIDORO, - /*0x76*/ SE_W085, - /*0x77*/ SE_W085B, - /*0x78*/ SE_W231, - /*0x79*/ SE_W171, - /*0x7A*/ SE_W233, - /*0x7B*/ SE_W233B, - /*0x7C*/ SE_W145, - /*0x7D*/ SE_W145B, - /*0x7E*/ SE_W145C, - /*0x7F*/ SE_W240, - /*0x80*/ SE_W015, - /*0x81*/ SE_W081, - /*0x82*/ SE_W081B, - /*0x83*/ SE_W088, - /*0x84*/ SE_W016, - /*0x85*/ SE_W016B, - /*0x86*/ SE_W003, - /*0x87*/ SE_W104, - /*0x88*/ SE_W013, - /*0x89*/ SE_W196, - /*0x8A*/ SE_W086, - /*0x8B*/ SE_W004, - /*0x8C*/ SE_W025, - /*0x8D*/ SE_W025B, - SE_W152, - SE_W026, - SE_W172, - SE_W172B, - SE_W053, - SE_W007, - SE_W092, - SE_W221, - SE_W221B, - SE_W052, - SE_W036, - SE_W059, - SE_W059B, - SE_W010, - SE_W011, - SE_W017, - SE_W019, - SE_W028, - SE_W013B, - SE_W044, - SE_W029, - SE_W057, - SE_W056, - SE_W250, - SE_W030, - SE_W039, - SE_W054, - SE_W077, - SE_W020, - SE_W082, - SE_W047, - SE_W195, - SE_W006, - SE_W091, - SE_W146, - SE_W120, - SE_W153, - SE_W071B, - SE_W071, - SE_W103, - /*0xB6*/ SE_W062, - /*0xB7*/ SE_W062B, - /*0xB8*/ SE_W048, - /*0xB9*/ SE_W187, - /*0xBA*/ SE_W118, - /*0xBB*/ SE_W155, - /*0xBC*/ SE_W122, - /*0xBD*/ SE_W060, - /*0xBE*/ SE_W185, - /*0xBF*/ SE_W014, - /*0xC0*/ SE_W043, - /*0xC1*/ SE_W207, - /*0xC2*/ SE_W207B, - /*0xC3*/ SE_W215, - /*0xC4*/ SE_W109, - /*0xC5*/ SE_W173, - /*0xC6*/ SE_W280, - /*0xC7*/ SE_W202, - /*0xC8*/ SE_W060B, - /*0xC9*/ SE_W076, - /*0xCA*/ SE_W080, - /*0xCB*/ SE_W100, - /*0xCC*/ SE_W107, - SE_W166, - SE_W129, - SE_W115, - SE_W112, - SE_W197, - SE_W199, - SE_W236, - SE_W204, - SE_W268, - SE_W070, - SE_W063, - SE_W127, - SE_W179, - SE_W151, - SE_W201, - SE_W161, - SE_W161B, - SE_W227, - SE_W227B, - SE_W226, - SE_W208, - SE_W213, - SE_W213B, - SE_W234, - SE_W260, - SE_W328, - SE_W320, - SE_W255, - SE_W291, - SE_W089, - SE_W239, - SE_W230, - SE_W281, - SE_W327, - SE_W287, - SE_W257, - SE_W253, - SE_W258, - SE_W322, - SE_W298, - SE_W287B, - SE_W114, - SE_W063B, - BGM_STOP = 349, - /*0x15E*/ BGM_TETSUJI, - /*0x15F*/ BGM_FIELD13, - /*0x160*/ BGM_KACHI22, - /*0x161*/ BGM_KACHI2, - /*0x162*/ BGM_KACHI3, - /*0x163*/ BGM_KACHI5, - /*0x164*/ BGM_PCC, - /*0x165*/ BGM_NIBI, - /*0x166*/ BGM_SUIKUN, - /*0x167*/ BGM_DOORO1, - /*0x168*/ BGM_DOORO_X1, - /*0x169*/ BGM_DOORO_X3, - /*0x16A*/ BGM_MACHI_S2, - /*0x16B*/ BGM_MACHI_S4, - /*0x16C*/ BGM_GIM, - /*0x16D*/ BGM_NAMINORI, - /*0x16E*/ BGM_DAN01, - /*0x16F*/ BGM_FANFA1, - /*0x170*/ BGM_ME_ASA, - /*0x171*/ BGM_ME_BACHI, - /*0x172*/ BGM_FANFA4, - /*0x173*/ BGM_FANFA5, - /*0x174*/ BGM_ME_WAZA, - /*0x175*/ BGM_BIJYUTU, - /*0x176*/ BGM_DOORO_X4, - /*0x177*/ BGM_FUNE_KAN, - /*0x178*/ BGM_ME_SHINKA, - /*0x179*/ BGM_SHINKA, - /*0x17A*/ BGM_ME_WASURE, - /*0x17B*/ BGM_SYOUJOEYE, - /*0x17C*/ BGM_BOYEYE, - /*0x17D*/ BGM_DAN02, - /*0x17E*/ BGM_MACHI_S3, - /*0x17F*/ BGM_ODAMAKI, - /*0x180*/ BGM_B_TOWER, - /*0x181*/ BGM_SWIMEYE, - /*0x182*/ BGM_DAN03, - /*0x183*/ BGM_ME_KINOMI, - /*0x184*/ BGM_ME_TAMA, - /*0x185*/ BGM_ME_B_BIG, - /*0x186*/ BGM_ME_B_SMALL, - /*0x187*/ BGM_ME_ZANNEN, - /*0x188*/ BGM_BD_TIME, - /*0x189*/ BGM_TEST1, - /*0x18A*/ BGM_TEST2, - /*0x18B*/ BGM_TEST3, - /*0x18C*/ BGM_TEST4, - /*0x18D*/ BGM_TEST, - /*0x18E*/ BGM_GOMACHI0, - /*0x18F*/ BGM_GOTOWN, - /*0x190*/ BGM_POKECEN, - /*0x191*/ BGM_NEXTROAD, - /*0x192*/ BGM_GRANROAD, - /*0x193*/ BGM_CYCLING, - /*0x194*/ BGM_FRIENDLY, - /*0x195*/ BGM_MISHIRO, - /*0x196*/ BGM_TOZAN, - /*0x197*/ BGM_GIRLEYE, - /*0x198*/ BGM_MINAMO, - /*0x199*/ BGM_ASHROAD, - /*0x19A*/ BGM_EVENT0, - /*0x19B*/ BGM_DEEPDEEP, - /*0x19C*/ BGM_KACHI1, - /*0x19D*/ BGM_TITLE3, - /*0x19E*/ BGM_DEMO1, - /*0x19F*/ BGM_GIRL_SUP, - /*0x1A0*/ BGM_HAGESHII, - /*0x1A1*/ BGM_KAKKOII, - /*0x1A2*/ BGM_KAZANBAI, - /*0x1A3*/ BGM_AQA_0, - /*0x1A4*/ BGM_TSURETEK, - /*0x1A5*/ BGM_BOY_SUP, - /*0x1A6*/ BGM_RAINBOW, - /*0x1A7*/ BGM_AYASII, - /*0x1A8*/ BGM_KACHI4, - /*0x1A9*/ BGM_ROPEWAY, - /*0x1AA*/ BGM_CASINO, - /*0x1AB*/ BGM_HIGHTOWN, - /*0x1AC*/ BGM_SAFARI, - BGM_C_ROAD, - BGM_AJITO, - BGM_M_BOAT, - BGM_M_DUNGON, - BGM_FINECITY, - BGM_MACHUPI, - BGM_P_SCHOOL, - BGM_DENDOU, - BGM_TONEKUSA, - BGM_MABOROSI, - BGM_CON_FAN, - BGM_CONTEST0, - BGM_MGM0, - BGM_T_BATTLE, - BGM_OOAME, - BGM_HIDERI, - BGM_RUNECITY, - BGM_CON_K, - BGM_EIKOU_R, - BGM_KARAKURI, - BGM_HUTAGO, - BGM_SITENNOU, - BGM_YAMA_EYE, - BGM_CONLOBBY, - BGM_INTER_V, - BGM_DAIGO, - BGM_THANKFOR, - BGM_END, - /*0x1C9*/ BGM_BATTLE_FRONTIER, // human-readable names start here because we don't know the actual filenames - BGM_BATTLE_ARENA, - BGM_ME_BATTLE_POINTS, // ME_ as in messagebox? Used for KINOMI (berries) and stuff above - BGM_ME_MATCH_CALL, - BGM_BATTLE_PYRAMID, - BGM_BATTLE_PYRAMID_SUMMIT, - BGM_BATTLE_PALACE, - BGM_FANFA_RAYQUAZA, - BGM_BATTLE_TOWER, - BGM_ME_BATTLE_SYMBOL, - BGM_BATTLE_DOME_TOURNAMENT, - BGM_BATTLE_PIKE, - BGM_BATTLE_FACTORY, - /*0x1D6*/ BGM_BATTLE_LEGENDARY, - /*0x1D7*/ BGM_BATTLE_FRONTIER_BRAIN, - /*0x1D8*/ BGM_BATTLE_MEW, - /*0x1D9*/ BGM_BATTLE_DOME, // end of the human-readable names - /*0x1DA*/ BGM_BATTLE27, // wild - /*0x1DB*/ BGM_BATTLE31, // aqua/magma grunt - /*0x1DC*/ BGM_BATTLE20, // trainer - /*0x1DD*/ BGM_BATTLE32, // gym leader - /*0x1DE*/ BGM_BATTLE33, // champion - /*0x1DF*/ BGM_BATTLE36, // regi - /*0x1E0*/ BGM_BATTLE34, // weather trio - /*0x1E1*/ BGM_BATTLE35, // rival - /*0x1E2*/ BGM_BATTLE38, // elite four - /*0x1E3*/ BGM_BATTLE30, // aqua/magma leader - /*0x1E4*/ BGM_FRLG_FOLLOW_ME, // FR/LG names not known, human-readable again! - BGM_FRLG_GAMECORNER, - BGM_FRLG_ROCKET_HIDEOUT, - BGM_FRLG_GYM, - BGM_FRLG_JIGGLYPUFF, - BGM_FRLG_OPENING, - BGM_FRLG_TITLE, - BGM_FRLG_CINNABAR_ISLAND, - BGM_FRLG_LAVENDER_TOWN, - BGM_FRLG_HEALING_TEST, - BGM_FRLG_BICYCLE, - BGM_FRLG_SUSPICIOUS_EYE, - BGM_FRLG_GIRL_EYE, - BGM_FRLG_BOY_EYE, - BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME, - BGM_FRLG_VIRIDIAN_FOREST, - BGM_FRLG_MT_MOON, - BGM_FRLG_POKEMON_MANSION, - BGM_FRLG_CREDITS, - BGM_FRLG_ROUTE_1, - BGM_FRLG_ROUTE_24, - BGM_FRLG_ROUTE_3, - BGM_FRLG_ROUTE_11, - BGM_FRLG_INDIGO_PLATEAU, - BGM_FRLG_BATTLE_LEADER, - BGM_FRLG_BATTLE_TRAINER, - BGM_FRLG_BATTLE_WILD_POKEMON, - BGM_FRLG_BATTLE_CHAMPION, - BGM_FRLG_PALLET_TOWN, - BGM_FRLG_OAK_LAB, - BGM_FRLG_PROF_OAK, - BGM_FRLG_POKEMON_CENTER, - BGM_FRLG_SS_ANNE, - BGM_FRLG_SURF, - BGM_FRLG_POKEMON_TOWER, - BGM_FRLG_SILPH, - BGM_FRLG_CERULEAN_CITY, - BGM_FRLG_CELADON_CITY, - BGM_FRLG_KACHI_TRAINER, // KACHI used in RS test - victory - BGM_FRLG_KACHI_WILD_POKEMON, - BGM_FRLG_KACHI_LEADER, - BGM_FRLG_VERMILION_CITY, - BGM_FRLG_VIRIDIAN_CITY, - BGM_FRLG_RIVAL, - BGM_FRLG_RIVAL_POSTBATTLE, - BGM_FRLG_ME_POKEDEX_EVAL, - BGM_FRLG_ME_KEYITEM, - BGM_FRLG_FANFA_POKEMON_CAUGHT, - BGM_FRLG_FANFA_TRAINERCARD_PHOTO, - BGM_FRLG_GAMEFREAK_LOGO, - BGM_FRLG_CAUGHT_POKEMON, - BGM_FRLG_GAME_EXPLANATION_START, - BGM_FRLG_GAME_EXPLANATION_MIDDLE, - BGM_FRLG_GAME_EXPLANATION_END, - BGM_FRLG_POKEMON_JUMP, - BGM_FRLG_UNION_ROOM, - BGM_FRLG_POKEMON_NETWORK_CENTER, - BGM_FRLG_MYSTERY_GIFT, - BGM_FRLG_DODRIO_BERRY_PICK, - BGM_FRLG_MT_EMBER, - BGM_FRLG_TEACHY_TV_EPISODE, - BGM_FRLG_SEVII_ISLANDS, - BGM_FRLG_TANOBY_RUINS, - BGM_FRLG_ISLAND_ONE, - BGM_FRLG_ISLAND_FOUR, - BGM_FRLG_ISLAND_SIX, - BGM_FRLG_FLUTE, - /*0x227*/ BGM_FRLG_BATTLE_DEOXYS, - /*0x228*/ BGM_FRLG_BATTLE_MEWTWO, - /*0x229*/ BGM_FRLG_BATTLE_LEGENDARY, - /*0x22A*/ BGM_FRLG_LEADER_EYE, - /*0x22B*/ BGM_FRLG_DEOXYS_EYE, - /*0x22C*/ BGM_FRLG_TRAINER_TOWER, - /*0x22D*/ BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, - /*0x22E*/ BGM_FRLG_TEACHY_TV, -}; - -#endif // GUARD_SONGS_H diff --git a/src/battle_2.c b/src/battle_2.c index f8b4113f0..6752c4d4f 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -4738,9 +4738,9 @@ static void HandleEndTurn_BattleWon(void) gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) - PlayBGM(BGM_KACHI3); + PlayBGM(MUS_KACHI3); else - PlayBGM(BGM_KACHI1); + PlayBGM(MUS_KACHI1); } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { @@ -4751,7 +4751,7 @@ static void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(BGM_KACHI5); + PlayBGM(MUS_KACHI5); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4759,13 +4759,13 @@ static void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(BGM_KACHI4); + PlayBGM(MUS_KACHI4); break; case TRAINER_CLASS_LEADER: - PlayBGM(BGM_KACHI3); + PlayBGM(MUS_KACHI3); break; default: - PlayBGM(BGM_KACHI1); + PlayBGM(MUS_KACHI1); break; } } diff --git a/src/battle_bg.c b/src/battle_bg.c index 82355273b..5d5bbf0e9 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -13,7 +13,7 @@ #include "task.h" #include "trig.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "strings.h" #include "window.h" #include "text_window.h" diff --git a/src/battle_message.c b/src/battle_message.c index 8a985102d..e37a4c30c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -484,8 +484,8 @@ const u8 gText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!"); const u8 gText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!"); const u8 gText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!"); const u8 gText_ShootSoClose[] = _("Shoot!\nIt was so close, too!"); -const u8 gText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p"); -const u8 gText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}"); +const u8 gText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p"); +const u8 gText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); const u8 gText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?"); const u8 gText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC."); const u8 gText_Someones[] = _("someone’s"); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 656f9f43a..43b802d0b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7121,7 +7121,7 @@ static void atk76_various(void) gBattleOutcome = BATTLE_OPPONENT_TELEPORTED; break; case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC: - EmitPlayFanfareOrBGM(0, BGM_KACHI1, TRUE); + EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE); MarkBufferBankForExecution(gActiveBank); break; } diff --git a/src/battle_setup.c b/src/battle_setup.c index be23a28c9..6d7a97844 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -11,7 +11,7 @@ #include "constants/game_stat.h" #include "event_data.h" #include "constants/species.h" -#include "songs.h" +#include "constants/songs.h" #include "metatile_behavior.h" #include "constants/maps.h" #include "field_player_avatar.h" @@ -520,25 +520,25 @@ void BattleSetup_StartLegendaryBattle(void) default: case SPECIES_GROUDON: gBattleTypeFlags |= BATTLE_TYPE_GROUDON; - CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34); + CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_BATTLE34); break; case SPECIES_KYOGRE: gBattleTypeFlags |= BATTLE_TYPE_KYOGRE; - CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34); + CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_BATTLE34); break; case SPECIES_RAYQUAZA: gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA; - CreateBattleStartTask(B_TRANSITION_RAYQUAZA, BGM_BATTLE_LEGENDARY); + CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_REKKU); break; case SPECIES_DEOXYS: - CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_DEOXYS); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEO); break; case SPECIES_LUGIA: case SPECIES_HO_OH: - CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_LEGENDARY); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEN); break; case SPECIES_MEW: - CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE_MEW); + CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_MEW); break; } @@ -555,9 +555,9 @@ void StartGroudonKyogreBattle(void) gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_RUBY) - CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON + CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON else - CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE + CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); @@ -590,7 +590,7 @@ void StartRegiBattle(void) transitionId = B_TRANSITION_GRID_SQUARES; break; } - CreateBattleStartTask(transitionId, BGM_BATTLE36); + CreateBattleStartTask(transitionId, MUS_BATTLE36); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); @@ -1446,46 +1446,46 @@ void SetUpTrainerEncounterMusic(void) switch (GetTrainerEncounterMusicId(trainerId)) { case TRAINER_ENCOUNTER_MUSIC_MALE: - music = BGM_BOYEYE; + music = MUS_BOYEYE; break; case TRAINER_ENCOUNTER_MUSIC_FEMALE: - music = BGM_GIRLEYE; + music = MUS_GIRLEYE; break; case TRAINER_ENCOUNTER_MUSIC_GIRL: - music = BGM_SYOUJOEYE; + music = MUS_SYOUJOEYE; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = BGM_HAGESHII; + music = MUS_HAGESHII; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = BGM_KAKKOII; + music = MUS_KAKKOII; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: - music = BGM_AQA_0; + music = MUS_AQA_0; break; case TRAINER_ENCOUNTER_MUSIC_MAGMA: - music = BGM_MGM0; + music = MUS_MGM0; break; case TRAINER_ENCOUNTER_MUSIC_SWIMMER: - music = BGM_SWIMEYE; + music = MUS_SWIMEYE; break; case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = BGM_HUTAGO; + music = MUS_HUTAGO; break; case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: - music = BGM_SITENNOU; + music = MUS_SITENNOU; break; case TRAINER_ENCOUNTER_MUSIC_HIKER: - music = BGM_YAMA_EYE; + music = MUS_YAMA_EYE; break; case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: - music = BGM_INTER_V; + music = MUS_INTER_V; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = BGM_TEST; + music = MUS_TEST; break; default: - music = BGM_AYASII; + music = MUS_AYASII; } PlayNewMapMusic(music); } diff --git a/src/berry_blender.c b/src/berry_blender.c index b1e8712a6..57b158870 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1305,11 +1305,11 @@ static void sub_8080018(void) sBerryBlenderData->field_4C = 128; sBerryBlenderData->gameFrameTime = 0; SetMainCallback2(sub_8081898); - if (GetCurrentMapMusic() != BGM_CYCLING) + if (GetCurrentMapMusic() != MUS_CYCLING) { sBerryBlenderData->field_154 = GetCurrentMapMusic(); } - PlayBGM(BGM_CYCLING); + PlayBGM(MUS_CYCLING); break; } @@ -1604,10 +1604,10 @@ static void sub_80808D4(void) sBerryBlenderData->field_120[i] = CreateTask(sUnknown_083399EC[i], 10 + i); } - if (GetCurrentMapMusic() != BGM_CYCLING) + if (GetCurrentMapMusic() != MUS_CYCLING) sBerryBlenderData->field_154 = GetCurrentMapMusic(); - PlayBGM(BGM_CYCLING); + PlayBGM(MUS_CYCLING); PlaySE(SE_MOTER); Blender_ControlHitPitch(); break; @@ -3522,7 +3522,7 @@ static void sub_8083F3C(u8 taskId) { if (gTasks[taskId].data[0] == 0) { - PlayFanfare(BGM_FANFA1); + PlayFanfare(MUS_FANFA1); gTasks[taskId].data[0]++; } if (IsFanfareTaskInactive()) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 2b88fec3a..bfb558444 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -594,14 +594,14 @@ static void Task_EvolutionScene(u8 taskID) case 3: if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID)) // wait for animation, play tu du SE { - PlaySE(BGM_ME_SHINKA); + PlaySE(MUS_ME_SHINKA); gTasks[taskID].tState++; } break; case 4: // play evolution music and fade screen black if (!IsSEPlaying()) { - PlayNewMapMusic(BGM_SHINKA); + PlayNewMapMusic(MUS_SHINKA); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); } @@ -677,7 +677,7 @@ static void Task_EvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); BattleHandleAddTextPrinter(gStringVar4, 0); - PlayBGM(BGM_FANFA5); + PlayBGM(MUS_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -772,7 +772,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(BGM_FANFA1); + PlayFanfare(MUS_FANFA1); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter @@ -962,15 +962,15 @@ static void Task_TradeEvolutionScene(u8 taskID) case 2: if (IsCryFinished()) { - m4aSongNumStop(BGM_SHINKA); - PlaySE(BGM_ME_SHINKA); + m4aSongNumStop(MUS_SHINKA); + PlaySE(MUS_ME_SHINKA); gTasks[taskID].tState++; } break; case 3: if (!IsSEPlaying()) { - PlayBGM(BGM_SHINKA); + PlayBGM(MUS_SHINKA); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); } @@ -1040,7 +1040,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); sub_807F1A8(0, gStringVar4, 1); - PlayFanfare(BGM_FANFA5); + PlayFanfare(MUS_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -1073,7 +1073,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } else { - PlayBGM(BGM_SHINKA); + PlayBGM(MUS_SHINKA); sub_807F1A8(0, gText_CommunicationStandby5, 1); gTasks[taskID].tState++; } @@ -1117,7 +1117,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(BGM_FANFA1); + PlayFanfare(MUS_FANFA1); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); sub_807F1A8(0, gDisplayedStringBattle, 1); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter diff --git a/src/field_special_scene.c b/src/field_special_scene.c index d46ddeaa6..a704beaab 100755 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -211,7 +211,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySE(SE_TRACK_HAIK); + PlaySE(SE_TRACK_HAIKI); data[1] = 0; data[0] = 5; } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 239c5d690..2496b9564 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -424,7 +424,7 @@ static bool8 InitHallOfFameScreen(void) if (!gPaletteFade.active) { SetMainCallback2(CB2_HallOfFame); - PlayBGM(BGM_DENDOU); + PlayBGM(MUS_DENDOU); return FALSE; } break; diff --git a/src/pokeball.c b/src/pokeball.c index 127ba8e9d..13969a5d1 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -885,7 +885,7 @@ static void sub_80760F8(struct Sprite *sprite) { gDoingBattleAnim = FALSE; m4aMPlayAllStop(); - PlaySE(BGM_FANFA5); + PlaySE(MUS_FANFA5); } else if (sprite->data[4] == 315) { diff --git a/src/pokemon_3.c b/src/pokemon_3.c index d58b024a8..164069fa6 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1145,11 +1145,11 @@ void ClearBattleMonForms(void) u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return BGM_BATTLE34; + return MUS_BATTLE34; if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return BGM_BATTLE36; + return MUS_BATTLE36; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) - return BGM_BATTLE20; + return MUS_BATTLE20; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass; @@ -1165,24 +1165,24 @@ u16 GetBattleBGM(void) { case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_LEADER: - return BGM_BATTLE30; + return MUS_BATTLE30; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: case TRAINER_CLASS_AQUA_ADMIN: case TRAINER_CLASS_MAGMA_ADMIN: - return BGM_BATTLE31; + return MUS_BATTLE31; case TRAINER_CLASS_LEADER: - return BGM_BATTLE32; + return MUS_BATTLE32; case TRAINER_CLASS_CHAMPION: - return BGM_BATTLE33; + return MUS_BATTLE33; case TRAINER_CLASS_PKMN_TRAINER_3: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) - return BGM_BATTLE35; + return MUS_BATTLE35; if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName)) - return BGM_BATTLE20; - return BGM_BATTLE35; + return MUS_BATTLE20; + return MUS_BATTLE35; case TRAINER_CLASS_ELITE_FOUR: - return BGM_BATTLE38; + return MUS_BATTLE38; case TRAINER_CLASS_SALON_MAIDEN: case TRAINER_CLASS_DOME_ACE: case TRAINER_CLASS_PALACE_MAVEN: @@ -1190,12 +1190,12 @@ u16 GetBattleBGM(void) case TRAINER_CLASS_FACTORY_HEAD: case TRAINER_CLASS_PIKE_QUEEN: case TRAINER_CLASS_PYRAMID_KING: - return BGM_BATTLE_FRONTIER_BRAIN; + return MUS_VS_FRONT; default: - return BGM_BATTLE20; + return MUS_BATTLE20; } } - return BGM_BATTLE27; + return MUS_BATTLE27; } void PlayBattleBGM(void) diff --git a/src/sound.c b/src/sound.c index 086fede67..0cb11d5a5 100644 --- a/src/sound.c +++ b/src/sound.c @@ -189,7 +189,7 @@ bool8 WaitFanfare(bool8 stop) if (!stop) m4aMPlayContinue(&gMPlay_BGM); else - m4aSongNumStart(SE_STOP); + m4aSongNumStart(MUS_DUMMY); return TRUE; } diff --git a/src/wallclock.c b/src/wallclock.c index cd85de230..897576719 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -16,7 +16,7 @@ #include "task.h" #include "strings.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "trig.h" #include "decompress.h" |