Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-15 16:50:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #356 from GriffinRichards/rename-songs

Browse Source 
Give songs meaningful english names
This commit is contained in:
GriffinR 2020-08-31 13:42:41 -04:00 committed by GitHub
commit 4cf0957795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
964 changed files with 8731 additions and 8814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/event.inc
View File

@ -1603,12 +1603,12 @@
callstd STD_PUT_ITEM_AWAY
.endm
.macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_FANFA1
.macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP
additem \item, \amount
msgreceiveditem \msg, \item, \amount, \fanfare
.endm
.macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_FANFA1
.macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP
loadword 0, \msg
setorcopyvar VAR_0x8000, \item
setorcopyvar VAR_0x8001, \amount

697
charmap.txt
View File

@ -466,356 +466,355 @@ SKY_BLUE = 0D
LIGHT_BLUE = 0E
WHITE2 = 0F @ duplicate of white?
@ sound and music
@ sound
MUS_DUMMY = 00 00
SE_STOP = 00 00
SE_KAIFUKU = 01 00
SE_PC_LOGIN = 02 00
SE_PC_OFF = 03 00
SE_PC_ON = 04 00
SE_SELECT = 05 00
SE_WIN_OPEN = 06 00
SE_WALL_HIT = 07 00
SE_DOOR = 08 00
SE_KAIDAN = 09 00
SE_DANSA = 0A 00
SE_JITENSYA = 0B 00
SE_KOUKA_L = 0C 00
SE_KOUKA_M = 0D 00
SE_KOUKA_H = 0E 00
SE_BOWA2 = 0F 00
SE_POKE_DEAD = 10 00
SE_NIGERU = 11 00
SE_JIDO_DOA = 12 00
SE_NAMINORI = 13 00
SE_BAN = 14 00
SE_PIN = 15 00
SE_BOO = 16 00
SE_BOWA = 17 00
SE_JYUNI = 18 00
SE_SEIKAI = 19 00
SE_HAZURE = 1A 00
SE_EXP = 1B 00
SE_JITE_PYOKO = 1C 00
SE_MU_PACHI = 1D 00
SE_TK_KASYA = 1E 00
SE_FU_ZAKU = 1F 00
SE_FU_ZAKU2 = 20 00
SE_FU_ZUZUZU = 21 00
SE_RU_GASHIN = 22 00
SE_RU_GASYAN = 23 00
SE_RU_BARI = 24 00
SE_RU_HYUU = 25 00
SE_KI_GASYAN = 26 00
SE_TK_WARPIN = 27 00
SE_TK_WARPOUT = 28 00
SE_TU_SAA = 29 00
SE_HI_TURUN = 2A 00
SE_TRACK_MOVE = 2B 00
SE_TRACK_STOP = 2C 00
SE_TRACK_HAIKI = 2D 00
SE_TRACK_DOOR = 2E 00
SE_MOTER = 2F 00
SE_SAVE = 30 00
SE_KON = 31 00
SE_KON2 = 32 00
SE_KON3 = 33 00
SE_KON4 = 34 00
SE_SUIKOMU = 35 00
SE_NAGERU = 36 00
SE_TOY_C = 37 00
SE_TOY_D = 38 00
SE_TOY_E = 39 00
SE_TOY_F = 3A 00
SE_TOY_G = 3B 00
SE_TOY_A = 3C 00
SE_TOY_B = 3D 00
SE_TOY_C1 = 3E 00
SE_MIZU = 3F 00
SE_HASHI = 40 00
SE_DAUGI = 41 00
SE_PINPON = 42 00
SE_FUUSEN1 = 43 00
SE_FUUSEN2 = 44 00
SE_FUUSEN3 = 45 00
SE_TOY_KABE = 46 00
SE_TOY_DANGO = 47 00
SE_DOKU = 48 00
SE_ESUKA = 49 00
SE_T_AME = 4A 00
SE_T_AME_E = 4B 00
SE_T_OOAME = 4C 00
SE_T_OOAME_E = 4D 00
SE_T_KOAME = 4E 00
SE_T_KOAME_E = 4F 00
SE_T_KAMI = 50 00
SE_T_KAMI2 = 51 00
SE_ELEBETA = 52 00
SE_HINSI = 53 00
SE_EXPMAX = 54 00
SE_TAMAKORO = 55 00
SE_TAMAKORO_E = 56 00
SE_BASABASA = 57 00
SE_REGI = 58 00
SE_C_GAJI = 59 00
SE_C_MAKU_U = 5A 00
SE_C_MAKU_D = 5B 00
SE_C_PASI = 5C 00
SE_C_SYU = 5D 00
SE_C_PIKON = 5E 00
SE_REAPOKE = 5F 00
SE_OP_BASYU = 60 00
SE_BT_START = 61 00
SE_DENDOU = 62 00
SE_JIHANKI = 63 00
SE_TAMA = 64 00
SE_Z_SCROLL = 65 00
SE_Z_PAGE = 66 00
SE_PN_ON = 67 00
SE_PN_OFF = 68 00
SE_Z_SEARCH = 69 00
SE_TAMAGO = 6A 00
SE_TB_START = 6B 00
SE_TB_KON = 6C 00
SE_TB_KARA = 6D 00
SE_BIDORO = 6E 00
SE_W085 = 6F 00
SE_W085B = 70 00
SE_W231 = 71 00
SE_W171 = 72 00
SE_W233 = 73 00
SE_W233B = 74 00
SE_W145 = 75 00
SE_W145B = 76 00
SE_W145C = 77 00
SE_W240 = 78 00
SE_W015 = 79 00
SE_W081 = 7A 00
SE_W081B = 7B 00
SE_W088 = 7C 00
SE_W016 = 7D 00
SE_W016B = 7E 00
SE_W003 = 7F 00
SE_W104 = 80 00
SE_W013 = 81 00
SE_W196 = 82 00
SE_W086 = 83 00
SE_W004 = 84 00
SE_W025 = 85 00
SE_W025B = 86 00
SE_W152 = 87 00
SE_W026 = 88 00
SE_W172 = 89 00
SE_W172B = 8A 00
SE_W053 = 8B 00
SE_W007 = 8C 00
SE_W092 = 8D 00
SE_W221 = 8E 00
SE_W221B = 8F 00
SE_W052 = 90 00
SE_W036 = 91 00
SE_W059 = 92 00
SE_W059B = 93 00
SE_W010 = 94 00
SE_W011 = 95 00
SE_W017 = 96 00
SE_W019 = 97 00
SE_W028 = 98 00
SE_W013B = 99 00
SE_W044 = 9A 00
SE_W029 = 9B 00
SE_W057 = 9C 00
SE_W056 = 9D 00
SE_W250 = 9E 00
SE_W030 = 9F 00
SE_W039 = A0 00
SE_W054 = A1 00
SE_W077 = A2 00
SE_W020 = A3 00
SE_W082 = A4 00
SE_W047 = A5 00
SE_W195 = A6 00
SE_W006 = A7 00
SE_W091 = A8 00
SE_W146 = A9 00
SE_W120 = AA 00
SE_W153 = AB 00
SE_W071B = AC 00
SE_W071 = AD 00
SE_W103 = AE 00
SE_W062 = AF 00
SE_W062B = B0 00
SE_W048 = B1 00
SE_W187 = B2 00
SE_W118 = B3 00
SE_W155 = B4 00
SE_W122 = B5 00
SE_W060 = B6 00
SE_W185 = B7 00
SE_W014 = B8 00
SE_W043 = B9 00
SE_W207 = BA 00
SE_W207B = BB 00
SE_W215 = BC 00
SE_W109 = BD 00
SE_W173 = BE 00
SE_W280 = BF 00
SE_W202 = C0 00
SE_W060B = C1 00
SE_W076 = C2 00
SE_W080 = C3 00
SE_W100 = C4 00
SE_W107 = C5 00
SE_W166 = C6 00
SE_W129 = C7 00
SE_W115 = C8 00
SE_W112 = C9 00
SE_W197 = CA 00
SE_W199 = CB 00
SE_W236 = CC 00
SE_W204 = CD 00
SE_W268 = CE 00
SE_W070 = CF 00
SE_W063 = D0 00
SE_W127 = D1 00
SE_W179 = D2 00
SE_W151 = D3 00
SE_W201 = D4 00
SE_W161 = D5 00
SE_W161B = D6 00
SE_W227 = D7 00
SE_W227B = D8 00
SE_W226 = D9 00
SE_W208 = DA 00
SE_W213 = DB 00
SE_W213B = DC 00
SE_W234 = DD 00
SE_W260 = DE 00
SE_W328 = DF 00
SE_W320 = E0 00
SE_W255 = E1 00
SE_W291 = E2 00
SE_W089 = E3 00
SE_W239 = E4 00
SE_W230 = E5 00
SE_W281 = E6 00
SE_W327 = E7 00
SE_W287 = E8 00
SE_W257 = E9 00
SE_W253 = EA 00
SE_W258 = EB 00
SE_W322 = EC 00
SE_W298 = ED 00
SE_W287B = EE 00
SE_W114 = EF 00
SE_W063B = F0 00
MUS_W_DOOR = F1 00
SE_CARD1 = F2 00
SE_CARD2 = F3 00
SE_CARD3 = F4 00
SE_BAG1 = F5 00
SE_BAG2 = F6 00
SE_GETTING = F7 00
SE_SHOP = F8 00
SE_KITEKI = F9 00
SE_HELP_OP = FA 00
SE_HELP_CL = FB 00
SE_HELP_NG = FC 00
SE_DEOMOV = FD 00
SE_EXCELLENT = FE 00
SE_NAWAMISS = FF 00
MUS_ME_ASA = 00 01
MUS_FANFA1 = 01 01
MUS_FANFA4 = 02 01
MUS_FANFA5 = 03 01
MUS_ME_BACHI = 04 01
MUS_ME_WAZA = 05 01
MUS_ME_KINOMI = 06 01
MUS_ME_SHINKA = 07 01
MUS_SHINKA = 08 01
MUS_BATTLE32 = 09 01
MUS_BATTLE20 = 0A 01
MUS_P_SCHOOL = 0B 01
MUS_ME_B_BIG = 0C 01
MUS_ME_B_SMALL = 0D 01
MUS_ME_WASURE = 0E 01
MUS_ME_ZANNEN = 0F 01
MUS_ANNAI = 10 01
MUS_SLOT = 11 01
MUS_AJITO = 12 01
MUS_GYM = 13 01
MUS_PURIN = 14 01
MUS_DEMO = 15 01
MUS_TITLE = 16 01
MUS_GUREN = 17 01
MUS_SHION = 18 01
MUS_KAIHUKU = 19 01
MUS_CYCLING = 1A 01
MUS_ROCKET = 1B 01
MUS_SHOUJO = 1C 01
MUS_SHOUNEN = 1D 01
MUS_DENDOU = 1E 01
MUS_T_MORI = 1F 01
MUS_OTSUKIMI = 20 01
MUS_POKEYASHI = 21 01
MUS_ENDING = 22 01
MUS_LOAD01 = 23 01
MUS_OPENING = 24 01
MUS_LOAD02 = 25 01
MUS_LOAD03 = 26 01
MUS_CHAMP_R = 27 01
MUS_VS_GYM = 28 01
MUS_VS_TORE = 29 01
MUS_VS_YASEI = 2A 01
MUS_VS_LAST = 2B 01
MUS_MASARA = 2C 01
MUS_KENKYU = 2D 01
MUS_OHKIDO = 2E 01
MUS_POKECEN = 2F 01
MUS_SANTOAN = 30 01
MUS_NAMINORI = 31 01
MUS_P_TOWER = 32 01
MUS_SHIRUHU = 33 01
MUS_HANADA = 34 01
MUS_TAMAMUSI = 35 01
MUS_WIN_TRE = 36 01
MUS_WIN_YASEI = 37 01
MUS_WIN_GYM = 38 01
MUS_KUCHIBA = 39 01
MUS_NIBI = 3A 01
MUS_RIVAL1 = 3B 01
MUS_RIVAL2 = 3C 01
MUS_FAN2 = 3D 01
MUS_FAN5 = 3E 01
MUS_FAN6 = 3F 01
MUS_ME_PHOTO = 40 01
MUS_TITLEROG = 41 01
MUS_GET_YASEI = 42 01
MUS_SOUSA = 43 01
MUS_SEKAIKAN = 44 01
MUS_SEIBETU = 45 01
MUS_JUMP = 46 01
MUS_UNION = 47 01
MUS_NETWORK = 48 01
MUS_OKURIMONO = 49 01
MUS_KINOMIKUI = 4A 01
MUS_NANADUNGEON = 4B 01
MUS_OSHIE_TV = 4C 01
MUS_NANASHIMA = 4D 01
MUS_NANAISEKI = 4E 01
MUS_NANA123 = 4F 01
MUS_NANA45 = 50 01
MUS_NANA67 = 51 01
MUS_POKEFUE = 52 01
MUS_VS_DEO = 53 01
MUS_VS_MYU2 = 54 01
MUS_VS_DEN = 55 01
MUS_EXEYE = 56 01
MUS_DEOEYE = 57 01
MUS_T_TOWER = 58 01
MUS_SLOWMASARA = 59 01
MUS_TVNOIZE = 5A 01
MUS_DUMMY = 00 00
SE_USE_ITEM = 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_RS_DOOR = 08 00
SE_EXIT = 09 00
SE_LEDGE = 0A 00
SE_BIKE_BELL = 0B 00
SE_NOT_EFFECTIVE = 0C 00
SE_EFFECTIVE = 0D 00
SE_SUPER_EFFECTIVE = 0E 00
SE_BALL_OPEN = 0F 00
SE_FAINT = 10 00
SE_FLEE = 11 00
SE_SLIDING_DOOR = 12 00
SE_SHIP = 13 00
SE_BANG = 14 00
SE_PIN = 15 00
SE_BOO = 16 00
SE_BALL = 17 00
SE_CONTEST_PLACE = 18 00
SE_SUCCESS = 19 00
SE_FAILURE = 1A 00
SE_EXP = 1B 00
SE_BIKE_HOP = 1C 00
SE_SWITCH = 1D 00
SE_CLICK = 1E 00
SE_FU_ZAKU = 1F 00
SE_CONTEST_CONDITION_LOSE = 20 00
SE_LAVARIDGE_FALL_WARP = 21 00
SE_ICE_STAIRS = 22 00
SE_ICE_BREAK = 23 00
SE_ICE_CRACK = 24 00
SE_FALL = 25 00
SE_UNLOCK = 26 00
SE_WARP_IN = 27 00
SE_WARP_OUT = 28 00
SE_REPEL = 29 00
SE_ROTATING_GATE = 2A 00
SE_TRUCK_MOVE = 2B 00
SE_TRUCK_STOP = 2C 00
SE_TRUCK_UNLOAD = 2D 00
SE_TRUCK_DOOR = 2E 00
SE_BERRY_BLENDER = 2F 00
SE_SAVE = 30 00
SE_BALL_BOUNCE_1 = 31 00
SE_BALL_BOUNCE_2 = 32 00
SE_BALL_BOUNCE_3 = 33 00
SE_BALL_BOUNCE_4 = 34 00
SE_BALL_TRADE = 35 00
SE_BALL_THROW = 36 00
SE_NOTE_C = 37 00
SE_NOTE_D = 38 00
SE_NOTE_E = 39 00
SE_NOTE_F = 3A 00
SE_NOTE_G = 3B 00
SE_NOTE_A = 3C 00
SE_NOTE_B = 3D 00
SE_NOTE_C_HIGH = 3E 00
SE_PUDDLE = 3F 00
SE_BRIDGE_WALK = 40 00
SE_ITEMFINDER = 41 00
SE_DING_DONG = 42 00
SE_BALLOON_RED = 43 00
SE_BALLOON_BLUE = 44 00
SE_BALLOON_YELLOW = 45 00
SE_BREAKABLE_DOOR = 46 00
SE_MUD_BALL = 47 00
SE_FIELD_POISON = 48 00
SE_ESCALATOR = 49 00
SE_THUNDERSTORM = 4A 00
SE_THUNDERSTORM_STOP = 4B 00
SE_DOWNPOUR = 4C 00
SE_DOWNPOUR_STOP = 4D 00
SE_RAIN = 4E 00
SE_RAIN_STOP = 4F 00
SE_THUNDER = 50 00
SE_THUNDER2 = 51 00
SE_ELEVATOR = 52 00
SE_LOW_HEALTH = 53 00
SE_EXP_MAX = 54 00
SE_ROULETTE_BALL = 55 00
SE_ROULETTE_BALL2 = 56 00
SE_TAILLOW_WING_FLAP = 57 00
SE_RS_SHOP = 58 00
SE_CONTEST_HEART = 59 00
SE_CONTEST_CURTAIN_RISE = 5A 00
SE_CONTEST_CURTAIN_FALL = 5B 00
SE_CONTEST_ICON_CHANGE = 5C 00
SE_CONTEST_ICON_CLEAR = 5D 00
SE_CONTEST_MONS_TURN = 5E 00
SE_SHINY = 5F 00
SE_INTRO_BLAST = 60 00
SE_MUGSHOT = 61 00
SE_APPLAUSE = 62 00
SE_VEND = 63 00
SE_ORB = 64 00
SE_DEX_SCROLL = 65 00
SE_DEX_PAGE = 66 00
SE_POKENAV_ON = 67 00
SE_POKENAV_OFF = 68 00
SE_DEX_SEARCH = 69 00
SE_EGG_HATCH = 6A 00
SE_BALL_TRAY_ENTER = 6B 00
SE_BALL_TRAY_BALL = 6C 00
SE_BALL_TRAY_EXIT = 6D 00
SE_GLASS_FLUTE = 6E 00
SE_M_THUNDERBOLT = 6F 00
SE_M_THUNDERBOLT2 = 70 00
SE_M_HARDEN = 71 00
SE_M_NIGHTMARE = 72 00
SE_M_VITAL_THROW = 73 00
SE_M_VITAL_THROW2 = 74 00
SE_M_BUBBLE = 75 00
SE_M_BUBBLE2 = 76 00
SE_M_BUBBLE3 = 77 00
SE_M_RAIN_DANCE = 78 00
SE_M_CUT = 79 00
SE_M_STRING_SHOT = 7A 00
SE_M_STRING_SHOT2 = 7B 00
SE_M_ROCK_THROW = 7C 00
SE_M_GUST = 7D 00
SE_M_GUST2 = 7E 00
SE_M_DOUBLE_SLAP = 7F 00
SE_M_DOUBLE_TEAM = 80 00
SE_M_RAZOR_WIND = 81 00
SE_M_ICY_WIND = 82 00
SE_M_THUNDER_WAVE = 83 00
SE_M_COMET_PUNCH = 84 00
SE_M_MEGA_KICK = 85 00
SE_M_MEGA_KICK2 = 86 00
SE_M_CRABHAMMER = 87 00
SE_M_JUMP_KICK = 88 00
SE_M_FLAME_WHEEL = 89 00
SE_M_FLAME_WHEEL2 = 8A 00
SE_M_FLAMETHROWER = 8B 00
SE_M_FIRE_PUNCH = 8C 00
SE_M_TOXIC = 8D 00
SE_M_SACRED_FIRE = 8E 00
SE_M_SACRED_FIRE2 = 8F 00
SE_M_EMBER = 90 00
SE_M_TAKE_DOWN = 91 00
SE_M_BLIZZARD = 92 00
SE_M_BLIZZARD2 = 93 00
SE_M_SCRATCH = 94 00
SE_M_VICEGRIP = 95 00
SE_M_WING_ATTACK = 96 00
SE_M_FLY = 97 00
SE_M_SAND_ATTACK = 98 00
SE_M_RAZOR_WIND2 = 99 00
SE_M_BITE = 9A 00
SE_M_HEADBUTT = 9B 00
SE_M_SURF = 9C 00
SE_M_HYDRO_PUMP = 9D 00
SE_M_WHIRLPOOL = 9E 00
SE_M_HORN_ATTACK = 9F 00
SE_M_TAIL_WHIP = A0 00
SE_M_MIST = A1 00
SE_M_POISON_POWDER = A2 00
SE_M_BIND = A3 00
SE_M_DRAGON_RAGE = A4 00
SE_M_SING = A5 00
SE_M_PERISH_SONG = A6 00
SE_M_PAY_DAY = A7 00
SE_M_DIG = A8 00
SE_M_DIZZY_PUNCH = A9 00
SE_M_SELF_DESTRUCT = AA 00
SE_M_EXPLOSION = AB 00
SE_M_ABSORB_2 = AC 00
SE_M_ABSORB = AD 00
SE_M_SCREECH = AE 00
SE_M_BUBBLE_BEAM = AF 00
SE_M_BUBBLE_BEAM2 = B0 00
SE_M_SUPERSONIC = B1 00
SE_M_BELLY_DRUM = B2 00
SE_M_METRONOME = B3 00
SE_M_BONEMERANG = B4 00
SE_M_LICK = B5 00
SE_M_PSYBEAM = B6 00
SE_M_FAINT_ATTACK = B7 00
SE_M_SWORDS_DANCE = B8 00
SE_M_LEER = B9 00
SE_M_SWAGGER = BA 00
SE_M_SWAGGER2 = BB 00
SE_M_HEAL_BELL = BC 00
SE_M_CONFUSE_RAY = BD 00
SE_M_SNORE = BE 00
SE_M_BRICK_BREAK = BF 00
SE_M_GIGA_DRAIN = C0 00
SE_M_PSYBEAM2 = C1 00
SE_M_SOLAR_BEAM = C2 00
SE_M_PETAL_DANCE = C3 00
SE_M_TELEPORT = C4 00
SE_M_MINIMIZE = C5 00
SE_M_SKETCH = C6 00
SE_M_SWIFT = C7 00
SE_M_REFLECT = C8 00
SE_M_BARRIER = C9 00
SE_M_DETECT = CA 00
SE_M_LOCK_ON = CB 00
SE_M_MOONLIGHT = CC 00
SE_M_CHARM = CD 00
SE_M_CHARGE = CE 00
SE_M_STRENGTH = CF 00
SE_M_HYPER_BEAM = D0 00
SE_M_WATERFALL = D1 00
SE_M_REVERSAL = D2 00
SE_M_ACID_ARMOR = D3 00
SE_M_SANDSTORM = D4 00
SE_M_TRI_ATTACK = D5 00
SE_M_TRI_ATTACK2 = D6 00
SE_M_ENCORE = D7 00
SE_M_ENCORE2 = D8 00
SE_M_BATON_PASS = D9 00
SE_M_MILK_DRINK = DA 00
SE_M_ATTRACT = DB 00
SE_M_ATTRACT2 = DC 00
SE_M_MORNING_SUN = DD 00
SE_M_FLATTER = DE 00
SE_M_SAND_TOMB = DF 00
SE_M_GRASSWHISTLE = E0 00
SE_M_SPIT_UP = E1 00
SE_M_DIVE = E2 00
SE_M_EARTHQUAKE = E3 00
SE_M_TWISTER = E4 00
SE_M_SWEET_SCENT = E5 00
SE_M_YAWN = E6 00
SE_M_SKY_UPPERCUT = E7 00
SE_M_STAT_INCREASE = E8 00
SE_M_HEAT_WAVE = E9 00
SE_M_UPROAR = EA 00
SE_M_HAIL = EB 00
SE_M_COSMIC_POWER = EC 00
SE_M_TEETER_DANCE = ED 00
SE_M_STAT_DECREASE = EE 00
SE_M_HAZE = EF 00
SE_M_HYPER_BEAM2 = F0 00
SE_DOOR = F1 00
SE_CARD_FLIP = F2 00
SE_CARD_FLIPPING = F3 00
SE_CARD_OPEN = F4 00
SE_BAG_CURSOR = F5 00
SE_BAG_POCKET = F6 00
SE_BALL_CLICK = F7 00
SE_SHOP = F8 00
SE_SS_ANNE_HORN = F9 00
SE_HELP_OPEN = FA 00
SE_HELP_CLOSE = FB 00
SE_HELP_ERROR = FC 00
SE_DEOXYS_MOVE = FD 00
SE_POKE_JUMP_SUCCESS = FE 00
SE_POKE_JUMP_FAILURE = FF 00
MUS_HEAL = 00 01
MUS_LEVEL_UP = 01 01
MUS_OBTAIN_ITEM = 02 01
MUS_EVOLVED = 03 01
MUS_OBTAIN_BADGE = 04 01
MUS_OBTAIN_TMHM = 05 01
MUS_OBTAIN_BERRY = 06 01
MUS_EVOLUTION_INTRO = 07 01
MUS_EVOLUTION = 08 01
MUS_RS_VS_GYM_LEADER = 09 01
MUS_RS_VS_TRAINER = 0A 01
MUS_SCHOOL = 0B 01
MUS_SLOTS_JACKPOT = 0C 01
MUS_SLOTS_WIN = 0D 01
MUS_MOVE_DELETED = 0E 01
MUS_TOO_BAD = 0F 01
MUS_FOLLOW_ME = 10 01
MUS_GAME_CORNER = 11 01
MUS_ROCKET_HIDEOUT = 12 01
MUS_GYM = 13 01
MUS_JIGGLYPUFF = 14 01
MUS_INTRO_FIGHT = 15 01
MUS_TITLE = 16 01
MUS_CINNABAR = 17 01
MUS_LAVENDER = 18 01
MUS_HEAL_UNUSED = 19 01
MUS_CYCLING = 1A 01
MUS_ENCOUNTER_ROCKET = 1B 01
MUS_ENCOUNTER_GIRL = 1C 01
MUS_ENCOUNTER_BOY = 1D 01
MUS_HALL_OF_FAME = 1E 01
MUS_VIRIDIAN_FOREST = 1F 01
MUS_MT_MOON = 20 01
MUS_POKE_MANSION = 21 01
MUS_CREDITS = 22 01
MUS_ROUTE1 = 23 01
MUS_ROUTE24 = 24 01
MUS_ROUTE3 = 25 01
MUS_ROUTE11 = 26 01
MUS_VICTORY_ROAD = 27 01
MUS_VS_GYM_LEADER = 28 01
MUS_VS_TRAINER = 29 01
MUS_VS_WILD = 2A 01
MUS_VS_CHAMPION = 2B 01
MUS_PALLET = 2C 01
MUS_OAK_LAB = 2D 01
MUS_OAK = 2E 01
MUS_POKE_CENTER = 2F 01
MUS_SS_ANNE = 30 01
MUS_SURF = 31 01
MUS_POKE_TOWER = 32 01
MUS_SILPH = 33 01
MUS_FUCHSIA = 34 01
MUS_CELADON = 35 01
MUS_VICTORY_TRAINER = 36 01
MUS_VICTORY_WILD = 37 01
MUS_VICTORY_GYM_LEADER = 38 01
MUS_VERMILLION = 39 01
MUS_PEWTER = 3A 01
MUS_ENCOUNTER_RIVAL = 3B 01
MUS_RIVAL_EXIT = 3C 01
MUS_DEX_RATING = 3D 01
MUS_OBTAIN_KEY_ITEM = 3E 01
MUS_CAUGHT_INTRO = 3F 01
MUS_PHOTO = 40 01
MUS_GAME_FREAK = 41 01
MUS_CAUGHT = 42 01
MUS_NEW_GAME_INSTRUCT = 43 01
MUS_NEW_GAME_INTRO = 44 01
MUS_NEW_GAME_EXIT = 45 01
MUS_POKE_JUMP = 46 01
MUS_UNION_ROOM = 47 01
MUS_NET_CENTER = 48 01
MUS_MYSTERY_GIFT = 49 01
MUS_BERRY_PICK = 4A 01
MUS_SEVII_CAVE = 4B 01
MUS_TEACHY_TV_SHOW = 4C 01
MUS_SEVII_ROUTE = 4D 01
MUS_SEVII_DUNGEON = 4E 01
MUS_SEVII_123 = 4F 01
MUS_SEVII_45 = 50 01
MUS_SEVII_67 = 51 01
MUS_POKE_FLUTE = 52 01
MUS_VS_DEOXYS = 53 01
MUS_VS_MEWTWO = 54 01
MUS_VS_LEGEND = 55 01
MUS_ENCOUNTER_GYM_LEADER = 56 01
MUS_ENCOUNTER_DEOXYS = 57 01
MUS_TRAINER_TOWER = 58 01
MUS_SLOW_PALLET = 59 01
MUS_TEACHY_TV_MENU = 5A 01
A_BUTTON = F8 00
B_BUTTON = F8 01

2136
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

4
data/battle_scripts_1.s
View File

@ -3119,7 +3119,7 @@ BattleScript_Pausex20::
return
BattleScript_LevelUp::
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0
drawlvlupbox
@ -3149,7 +3149,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
updatechoicemoveonlvlup BS_ATTACKER

12
data/battle_scripts_2.s
View File

@ -134,7 +134,7 @@ BattleScript_PlayerUseItem::
BattleScript_AIUseFullRestoreOrHpHeal::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@ -150,7 +150,7 @@ BattleScript_AIUseFullRestoreOrHpHeal::
BattleScript_AIUseStatRestore::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@ -163,7 +163,7 @@ BattleScript_AIUseStatRestore::
BattleScript_AIUseXstat::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@ -175,7 +175,7 @@ BattleScript_AIUseXstat::
BattleScript_AIUseGuardSpec::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@ -185,7 +185,7 @@ BattleScript_AIUseGuardSpec::
finishaction
BattleScript_UseFluffyTail::
playse SE_NIGERU
playse SE_FLEE
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
@ -199,7 +199,7 @@ BattleScript_UsePokeFlute::
BattleScript_PokeFluteWakeUp::
printstring STRINGID_POKEFLUTE
waitmessage 64
fanfare MUS_POKEFUE
fanfare MUS_POKE_FLUTE
waitfanfare BS_ATTACKER
printstring STRINGID_MONHEARINGFLUTEAWOKE
waitmessage 64

6
data/event_scripts.s
View File

@ -1078,13 +1078,13 @@ Common_ShowEasyChatScreen:: @ 81A6AC0
@ Unused
EventScript_GymBadgeFanfare:: @ 81A6C21
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
waitfanfare
return
EventScript_OutOfCenterPartyHeal:: @ 81A6C26
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
fadescreen FADE_FROM_BLACK
@ -1113,7 +1113,7 @@ EventScript_ChangePokemonNickname:: @ 81A74EB
@ Unused
EventScript_HandOverItem:: @ 81A74F2
getitemname 0, VAR_0x8004
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
message Text_HandedOverItem
waitmessage
waitfanfare

2
data/maps/BattleColosseum_2P/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum_2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattleColosseum_4P/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum_4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
setfieldeffectarg 1, 56
setfieldeffectarg 2, 2
dofieldeffect 68
playbgm MUS_DEOEYE, 0
playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect 68
applymovement 2, Movement_DeoxysApproach
waitmovement 0

2
data/maps/CeladonCity/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY",
"name": "CeladonCity",
"layout": "LAYOUT_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/CeladonCity_Condominiums_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
"name": "CeladonCity_Condominiums_1F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_Condominiums_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
"name": "CeladonCity_Condominiums_2F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_Condominiums_3F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
"name": "CeladonCity_Condominiums_3F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_Condominiums_Roof/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
"name": "CeladonCity_Condominiums_Roof",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
"name": "CeladonCity_Condominiums_RoofRoom",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
View File

@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
removeobject 2
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare
@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA
removeobject 2
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare

2
data/maps/CeladonCity_DepartmentStore_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
"name": "CeladonCity_DepartmentStore_1F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
"name": "CeladonCity_DepartmentStore_2F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_3F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
"name": "CeladonCity_DepartmentStore_3F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_4F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
"name": "CeladonCity_DepartmentStore_4F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_5F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
"name": "CeladonCity_DepartmentStore_5F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_Elevator/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
"name": "CeladonCity_DepartmentStore_Elevator",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_DepartmentStore_Roof/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF",
"name": "CeladonCity_DepartmentStore_Roof",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
View File

@ -149,7 +149,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
additem VAR_0x8009
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_ReceivedItemFromLittleGirl
waitmessage
waitfanfare
@ -269,7 +269,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
updatemoneybox 0, 0, 0
getitemname 0, VAR_TEMP_0
playse SE_JIHANKI
playse SE_VEND
msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
additem VAR_TEMP_0
goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink

2
data/maps/CeladonCity_GameCorner/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GAME_CORNER",
"name": "CeladonCity_GameCorner",
"layout": "LAYOUT_CELADON_CITY_GAME_CORNER",
"music": "MUS_SLOT",
"music": "MUS_GAME_CORNER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_GameCorner/scripts.inc
View File

@ -403,7 +403,7 @@ CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA
end
CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
playse SE_KI_GASYAN
playse SE_UNLOCK
setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0
setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1
setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1

2
data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
"name": "CeladonCity_GameCorner_PrizeRoom",
"layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
View File

@ -214,7 +214,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
@ -228,7 +228,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare

2
data/maps/CeladonCity_Gym/text.inc
View File

@ -12,7 +12,7 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
.string "GRASS type.\p"
.string "…Oh, I'm sorry, I had no idea that\n"
.string "you wished to challenge me.\p"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$"
CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260
.string "Oh!\n"

2
data/maps/CeladonCity_Hotel/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOTEL",
"name": "CeladonCity_Hotel",
"layout": "LAYOUT_CELADON_CITY_HOTEL",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_House1/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOUSE1",
"name": "CeladonCity_House1",
"layout": "LAYOUT_HOUSE5",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_PokemonCenter_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
"name": "CeladonCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_PokemonCenter_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
"name": "CeladonCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeladonCity_Restaurant/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_RESTAURANT",
"name": "CeladonCity_Restaurant",
"layout": "LAYOUT_CELADON_CITY_RESTAURANT",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCave_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_1F",
"name": "CeruleanCave_1F",
"layout": "LAYOUT_CERULEAN_CAVE_1F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCave_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_2F",
"name": "CeruleanCave_2F",
"layout": "LAYOUT_CERULEAN_CAVE_2F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCave_B1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_B1F",
"name": "CeruleanCave_B1F",
"layout": "LAYOUT_CERULEAN_CAVE_B1F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCave_B1F/scripts.inc
View File

@ -33,7 +33,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
waitmessage
waitmoncry
delay 20
playbgm MUS_EXEYE, 0
playbgm MUS_ENCOUNTER_GYM_LEADER, 0
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE

2
data/maps/CeruleanCity/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY",
"name": "CeruleanCity",
"layout": "LAYOUT_CERULEAN_CITY",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

6
data/maps/CeruleanCity/scripts.inc
View File

@ -42,7 +42,7 @@ CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9
CeruleanCity_EventScript_Rival:: @ 81664CC
textcolor 0
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_RIVAL1, 0
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter
waitmovement 0
@ -57,7 +57,7 @@ CeruleanCity_EventScript_Rival:: @ 81664CC
famechecker FAMECHECKER_BILL, 0
msgbox CeruleanCity_Text_RivalPostBattle
closemessage
playbgm MUS_RIVAL2, 0
playbgm MUS_RIVAL_EXIT, 0
compare VAR_TEMP_1, 0
call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 1
@ -179,7 +179,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated
message CeruleanCity_Text_GruntIntro
waitmessage
playbgm MUS_ROCKET, 0
playbgm MUS_ENCOUNTER_ROCKET, 0
waitbuttonpress
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1

2
data/maps/CeruleanCity/text.inc
View File

@ -53,7 +53,7 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E
.string "…Huh?\n"
.string "Me?\p"
.string "I'm an innocent bystander!\n"
.string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$"
.string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$"
CeruleanCity_Text_GruntDefeat:: @ 817EE70
.string "GRUNT: Stop! I give up!\n"

2
data/maps/CeruleanCity_BikeShop/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_BIKE_SHOP",
"name": "CeruleanCity_BikeShop",
"layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_BikeShop/scripts.inc
View File

@ -30,7 +30,7 @@ CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15
CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22
msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo
msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5
msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM
setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE
removeitem ITEM_BIKE_VOUCHER

2
data/maps/CeruleanCity_Gym/text.inc
View File

@ -5,7 +5,7 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF
.string "What is your approach when you\n"
.string "catch and train POKéMON?\p"
.string "My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF
.string "TM03 teaches WATER PULSE.\p"

2
data/maps/CeruleanCity_House1/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE1",
"name": "CeruleanCity_House1",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_House2/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE2",
"name": "CeruleanCity_House2",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE2",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_House3/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE3",
"name": "CeruleanCity_House3",
"layout": "LAYOUT_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_House4/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE4",
"name": "CeruleanCity_House4",
"layout": "LAYOUT_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_House5/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE5",
"name": "CeruleanCity_House5",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE5",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_Mart/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_MART",
"name": "CeruleanCity_Mart",
"layout": "LAYOUT_MART",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_PokemonCenter_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
"name": "CeruleanCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CeruleanCity_PokemonCenter_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
"name": "CeruleanCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CinnabarIsland/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND",
"name": "CinnabarIsland",
"layout": "LAYOUT_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/CinnabarIsland/scripts.inc
View File

@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1
end
CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B
savebgm MUS_ANNAI
savebgm MUS_FOLLOW_ME
setflag FLAG_TEMP_2
setobjectxyperm LOCALID_BILL, 15, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT

14
data/maps/CinnabarIsland_Gym/scripts.inc
View File

@ -217,7 +217,7 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00
end
CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
waitfanfare
msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough
return
@ -238,7 +238,7 @@ CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43
end
CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor1
special DrawWholeMapView
@ -318,7 +318,7 @@ CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C
end
CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor2
special DrawWholeMapView
@ -403,7 +403,7 @@ CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA
end
CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor3
special DrawWholeMapView
@ -479,7 +479,7 @@ CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1
end
CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor4
special DrawWholeMapView
@ -555,7 +555,7 @@ CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8
end
CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor5
special DrawWholeMapView
@ -631,7 +631,7 @@ CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F
end
CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor6
special DrawWholeMapView

2
data/maps/CinnabarIsland_Gym/text.inc
View File

@ -6,7 +6,7 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543
.string "and ready with intense heat!\p"
.string "They incinerate all challengers!\p"
.string "Hah!\n"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA
.string "I have burned down to nothing!\n"

2
data/maps/CinnabarIsland_Mart/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_MART",
"name": "CinnabarIsland_Mart",
"layout": "LAYOUT_MART",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
"name": "CinnabarIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
View File

@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A
goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail
msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo
closemessage
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
playbgm MUS_FOLLOW_ME, 1
savebgm MUS_FOLLOW_ME
setflag FLAG_DONT_TRANSITION_MUSIC
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20

2
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
"name": "CinnabarIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
"name": "CinnabarIsland_PokemonLab_Entrance",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
"name": "CinnabarIsland_PokemonLab_ExperimentRoom",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
View File

@ -255,7 +255,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare
@ -270,7 +270,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare

2
data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
"name": "CinnabarIsland_PokemonLab_Lounge",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
"name": "CinnabarIsland_PokemonLab_ResearchRoom",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DiglettsCave_B1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_B1F",
"name": "DiglettsCave_B1F",
"layout": "LAYOUT_DIGLETTS_CAVE_B1F",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DiglettsCave_NorthEntrance/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
"name": "DiglettsCave_NorthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DiglettsCave_SouthEntrance/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"name": "DiglettsCave_SouthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND",
"name": "FiveIsland",
"layout": "LAYOUT_FIVE_ISLAND",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FiveIsland_Harbor/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HARBOR",
"name": "FiveIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_House1/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE1",
"name": "FiveIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_House2/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE2",
"name": "FiveIsland_House2",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_LostCave_Entrance/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
"name": "FiveIsland_LostCave_Entrance",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_LostCave_Room1/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
"name": "FiveIsland_LostCave_Room1",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room10/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10",
"name": "FiveIsland_LostCave_Room10",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room11/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11",
"name": "FiveIsland_LostCave_Room11",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room12/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12",
"name": "FiveIsland_LostCave_Room12",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room13/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13",
"name": "FiveIsland_LostCave_Room13",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room14/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14",
"name": "FiveIsland_LostCave_Room14",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room2/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2",
"name": "FiveIsland_LostCave_Room2",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room3/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3",
"name": "FiveIsland_LostCave_Room3",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room4/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4",
"name": "FiveIsland_LostCave_Room4",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room5/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5",
"name": "FiveIsland_LostCave_Room5",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room6/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6",
"name": "FiveIsland_LostCave_Room6",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room7/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7",
"name": "FiveIsland_LostCave_Room7",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room8/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8",
"name": "FiveIsland_LostCave_Room8",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_LostCave_Room9/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9",
"name": "FiveIsland_LostCave_Room9",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",

2
data/maps/FiveIsland_Meadow/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEADOW",
"name": "FiveIsland_Meadow",
"layout": "LAYOUT_FIVE_ISLAND_MEADOW",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FiveIsland_MemorialPillar/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR",
"name": "FiveIsland_MemorialPillar",
"layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_MEMORIAL_PILLAR",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FiveIsland_PokemonCenter_1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
"name": "FiveIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_PokemonCenter_2F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
"name": "FiveIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_ResortGorgeous/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
"name": "FiveIsland_ResortGorgeous",
"layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FiveIsland_ResortGorgeous_House/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
"name": "FiveIsland_ResortGorgeous_House",
"layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_RocketWarehouse/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
"name": "FiveIsland_RocketWarehouse",
"layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FiveIsland_WaterLabyrinth/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
"name": "FiveIsland_WaterLabyrinth",
"layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_WATER_LABYRINTH",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
View File

@ -34,7 +34,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
waitmessage

2
data/maps/FourIsland/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND",
"name": "FourIsland",
"layout": "LAYOUT_FOUR_ISLAND",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

6
data/maps/FourIsland/scripts.inc
View File

@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC
textcolor 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_KAIDAN
playse SE_EXIT
delay 35
removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB
textcolor 3
message DayCare_Text_ReceivedEgg
call EventScript_RestorePrevTextColor
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
msgbox DayCare_Text_TakeGoodCareOfIt

2
data/maps/FourIsland_Harbor/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HARBOR",
"name": "FourIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FourIsland_House1/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HOUSE1",
"name": "FourIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

Some files were not shown because too many files have changed in this diff Show More