Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-03-21 17:54:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR 2020-08-29 01:47:36 -04:00
parent d7ec1d234b
commit 038abf80ba
986 changed files with 41737 additions and 41731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

428
charmap.txt
View File

@ -407,242 +407,242 @@ WHITE2 = 0F @ duplicate of white?
@ sound and music
SE_STOP = 00 00
SE_KAIFUKU = 01 00
SE_PC_LOGON = 02 00
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_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_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_BOWA = 17 00
SE_JYUNI = 18 00
SE_BALL = 17 00
SE_CONTEST_PLACE = 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_SUCCESS = 1F 00
SE_FAILURE = 20 00
SE_EXP = 21 00
SE_JITE_PYOKO = 22 00
SE_MU_PACHI = 23 00
SE_TK_KASYA = 24 00
SE_BIKE_HOP = 22 00
SE_SWITCH = 23 00
SE_CLICK = 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_CONTEST_CONDITION_LOSE = 26 00
SE_LAVARIDGE_FALL_WARP = 27 00
SE_ICE_STAIRS = 28 00
SE_ICE_BREAK = 29 00
SE_ICE_CRACK = 2A 00
SE_FALL = 2B 00
SE_UNLOCK = 2C 00
SE_WARP_IN = 2D 00
SE_WARP_OUT = 2E 00
SE_REPEL = 2F 00
SE_ROTATING_GATE = 30 00
SE_TRUCK_MOVE = 31 00
SE_TRUCK_STOP = 32 00
SE_TRUCK_UNLOAD = 33 00
SE_TRUCK_DOOR = 34 00
SE_BERRY_BLENDER = 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_BALL_BOUNCE_1 = 38 00
SE_BALL_BOUNCE_2 = 39 00
SE_BALL_BOUNCE_3 = 3A 00
SE_BALL_BOUNCE_4 = 3B 00
SE_BALL_TRADE = 3C 00
SE_BALL_THROW = 3D 00
SE_NOTE_C = 3E 00
SE_NOTE_D = 3F 00
SE_NOTE_E = 40 00
SE_NOTE_F = 41 00
SE_NOTE_G = 42 00
SE_NOTE_A = 43 00
SE_NOTE_B = 44 00
SE_NOTE_C_HIGH = 45 00
SE_PUDDLE = 46 00
SE_BRIDGE_WALK = 47 00
SE_ITEMFINDER = 48 00
SE_DING_DONG = 49 00
SE_BALLOON_RED = 4A 00
SE_BALLOON_BLUE = 4B 00
SE_BALLOON_YELLOW = 4C 00
SE_BREAKABLE_DOOR = 4D 00
SE_MUD_BALL = 4E 00
SE_FIELD_POISON = 4F 00
SE_ESCALATOR = 50 00
SE_THUNDERSTORM = 51 00
SE_THUNDERSTORM_STOP = 52 00
SE_DOWNPOUR = 53 00
SE_DOWNPOUR_STOP = 54 00
SE_RAIN = 55 00
SE_RAIN_STOP = 56 00
SE_THUNDER = 57 00
SE_THUNDER2 = 58 00
SE_ELEVATOR = 59 00
SE_LOW_HEALTH = 5A 00
SE_EXP_MAX = 5B 00
SE_ROULETTE_BALL = 5C 00
SE_ROULETTE_BALL2 = 5D 00
SE_TAILLOW_WING_FLAP = 5E 00
SE_SHOP = 5F 00
SE_CONTEST_HEART = 60 00
SE_CONTEST_CURTAIN_RISE = 61 00
SE_CONTEST_CURTAIN_FALL = 62 00
SE_CONTEST_ICON_CHANGE = 63 00
SE_CONTEST_ICON_CLEAR = 64 00
SE_CONTEST_MONS_TURN = 65 00
SE_SHINY = 66 00
SE_INTRO_BLAST = 67 00
SE_MUGSHOT = 68 00
SE_APPLAUSE = 69 00
SE_VEND = 6A 00
SE_ORB = 6B 00
SE_DEX_SCROLL = 6C 00
SE_DEX_PAGE = 6D 00
SE_POKENAV_ON = 6E 00
SE_POKENAV_OFF = 6F 00
SE_DEX_SEARCH = 70 00
SE_EGG_HATCH = 71 00
SE_BALL_TRAY_ENTER = 72 00
SE_BALL_TRAY_BALL = 73 00
SE_BALL_TRAY_EXIT = 74 00
SE_GLASS_FLUTE = 75 00
MUS_STOP = 5D 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_LITTLEROOT_TEST = 5E 01
MUS_GSC_ROUTE38 = 5F 01
MUS_CAUGHT = 60 01
MUS_VICTORY_WILD = 61 01
MUS_VICTORY_GYM_LEADER = 62 01
MUS_VICTORY_LEAGUE = 63 01
MUS_C_COMM_CENTER = 64 01
MUS_GSC_PEWTER = 65 01
MUS_C_VS_LEGEND_BEAST = 66 01
MUS_ROUTE101 = 67 01
MUS_ROUTE110 = 68 01
MUS_ROUTE120 = 69 01
MUS_PETALBURG = 6A 01
MUS_OLDALE = 6B 01
MUS_GYM = 6C 01
MUS_SURF = 6D 01
MUS_PETALBURG_WOODS = 6E 01
MUS_LEVEL_UP = 6F 01
MUS_HEAL = 70 01
MUS_OBTAIN_BADGE = 71 01
MUS_OBTAIN_ITEM = 72 01
MUS_EVOLVED = 73 01
MUS_OBTAIN_TMHM = 74 01
MUS_LILYCOVE_MUSEUM = 75 01
MUS_ROUTE122 = 76 01
MUS_OCEANIC_MUSEUM = 77 01
MUS_EVOLUTION_INTRO = 78 01
MUS_EVOLUTION = 79 01
MUS_MOVE_DELETED = 7A 01
MUS_ENCOUNTER_GIRL = 7B 01
MUS_ENCOUNTER_MALE = 7C 01
MUS_ABANDONED_SHIP = 7D 01
MUS_FORTREE = 7E 01
MUS_BIRCH_LAB = 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_ENCOUNTER_SWIMMER = 81 01
MUS_CAVE_OF_ORIGIN = 82 01
MUS_OBTAIN_BERRY = 83 01
MUS_AWAKEN_LEGEND = 84 01
MUS_SLOTS_JACKPOT = 85 01
MUS_SLOTS_WIN = 86 01
MUS_TOO_BAD = 87 01
MUS_ROULETTE = 88 01
MUS_LINK_CONTEST_P1 = 89 01
MUS_LINK_CONTEST_P2 = 8A 01
MUS_LINK_CONTEST_P3 = 8B 01
MUS_LINK_CONTEST_P4 = 8C 01
MUS_ENCOUNTER_RICH = 8D 01
MUS_VERDANTURF = 8E 01
MUS_RUSTBORO = 8F 01
MUS_POKE_CENTER = 90 01
MUS_ROUTE104 = 91 01
MUS_ROUTE119 = 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_POKE_MART = 94 01
MUS_LITTLEROOT = 95 01
MUS_MT_CHIMNEY = 96 01
MUS_ENCOUNTER_FEMALE = 97 01
MUS_LILYCOVE = 98 01
MUS_ROUTE111 = 99 01
MUS_HELP = 9A 01
MUS_UNDERWATER = 9B 01
MUS_VICTORY_TRAINER = 9C 01
MUS_TITLE = 9D 01
MUS_INTRO = 9E 01
MUS_ENCOUNTER_MAY = 9F 01
MUS_ENCOUNTER_INTENSE = A0 01
MUS_ENCOUNTER_COOL = A1 01
MUS_ROUTE113 = A2 01
MUS_ENCOUNTER_AQUA = A3 01
MUS_FOLLOW_ME = A4 01
MUS_ENCOUNTER_BRENDAN = A5 01
MUS_EVER_GRANDE = A6 01
MUS_ENCOUNTER_SUSPICIOUS = A7 01
MUS_VICTORY_AQUA_MAGMA = A8 01
MUS_CABLE_CAR = A9 01
MUS_GAME_CORNER = AA 01
MUS_DEWFORD = AB 01
MUS_SAFARI_ZONE = AC 01
MUS_VICTORY_ROAD = AD 01
MUS_AQUA_MAGMA_HIDEOUT = AE 01
MUS_SAILING = AF 01
MUS_MT_PYRE = B0 01
MUS_SLATEPORT = B1 01
MUS_MT_PYRE_EXTERIOR = B2 01
MUS_SCHOOL = B3 01
MUS_HALL_OF_FAME = B4 01
MUS_FALLARBOR = B5 01
MUS_SEALED_CHAMBER = B6 01
MUS_CONTEST_WINNER = B7 01
MUS_CONTEST = B8 01
MUS_ENCOUNTER_MAGMA = B9 01
MUS_INTRO_BATTLE = BA 01
MUS_WEATHER_KYOGRE = BB 01
MUS_WEATHER_GROUDON = BC 01
MUS_SOOTOPOLIS = BD 01
MUS_CONTEST_RESULTS = BE 01
MUS_HALL_OF_FAME_ROOM = BF 01
MUS_TRICK_HOUSE = C0 01
MUS_ENCOUNTER_TWINS = C1 01
MUS_ENCOUNTER_ELITE_FOUR = C2 01
MUS_ENCOUNTER_HIKER = C3 01
MUS_CONTEST_LOBBY = C4 01
MUS_ENCOUNTER_INTERVIEWER = C5 01
MUS_ENCOUNTER_CHAMPION = C6 01
MUS_CREDITS = C7 01
MUS_END = C8 01
MUS_BATTLE27 = C9 01
MUS_BATTLE31 = CA 01
MUS_BATTLE20 = CB 01
MUS_BATTLE32 = CC 01
MUS_BATTLE33 = CD 01
MUS_BATTLE36 = CE 01
MUS_BATTLE34 = CF 01
MUS_BATTLE35 = D0 01
MUS_BATTLE38 = D1 01
MUS_BATTLE30 = D2 01
MUS_VS_WILD = C9 01
MUS_VS_AQUA_MAGMA = CA 01
MUS_VS_TRAINER = CB 01
MUS_VS_GYM_LEADER = CC 01
MUS_VS_CHAMPION = CD 01
MUS_VS_REGI = CE 01
MUS_VS_KYOGRE_GROUDON = CF 01
MUS_VS_RIVAL = D0 01
MUS_VS_ELITE_FOUR = D1 01
MUS_VS_AQUA_MAGMA_LEADER = D2 01
'\l' = FA @ scroll up window text
'\p' = FB @ new paragraph

8
constants/version.inc
View File

@ -5,11 +5,11 @@
.endif
.ifdef SAPPHIRE
.set MUS_EVIL_TEAM, MUS_AQA_0
.set MUS_GOOD_TEAM, MUS_MGM0
.set MUS_EVIL_TEAM, MUS_ENCOUNTER_AQUA
.set MUS_GOOD_TEAM, MUS_ENCOUNTER_MAGMA
.else
.set MUS_EVIL_TEAM, MUS_MGM0
.set MUS_GOOD_TEAM, MUS_AQA_0
.set MUS_EVIL_TEAM, MUS_ENCOUNTER_MAGMA
.set MUS_GOOD_TEAM, MUS_ENCOUNTER_AQUA
.endc
.ifdef SAPPHIRE

8
data-de/event_scripts.s vendored
View File

@ -868,13 +868,13 @@ Common_EventScript_SetLegendaryWeather:: @ 81A02C1
return
Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
waitfanfare
return
Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special ScrSpecial_HealPlayerParty
fadescreen FADE_FROM_BLACK
@ -891,7 +891,7 @@ EventScript_RegionMap:: @ 81A02D6
Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, FALSE
playbgm MUS_SAILING, FALSE
return
Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF
@ -974,7 +974,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 81A0678
Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F
bufferitemname 0, VAR_0x8004
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
message FallarborTown_House1_Text_1A1498
waitmessage
waitfanfare

2108
data/battle_anim_scripts.s vendored
View File

File diff suppressed because it is too large Load Diff

4
data/battle_scripts_1.s vendored
View File

@ -3193,7 +3193,7 @@ BattleScript_Pausex20:: @ 81D8EEF
return
BattleScript_LevelUp:: @ 81D8EF3
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring BATTLE_TEXT_GrewLevel
setbyte sLVLBOX_STATE, 0
drawlvlupbox
@ -3225,7 +3225,7 @@ BattleScript_ForgotAndLearnedNewMove: @ 81D8F46
BattleScript_LearnedNewMove: @ 81D8F4F
buffermovetolearn
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring BATTLE_TEXT_LearnedMove
waitmessage 64
updatechoicemoveonlvlup USER

10
data/battle_scripts_2.s vendored
View File

@ -112,7 +112,7 @@ BattleScript_PlayerUsesItem: @ 81D9F45
BattleScript_OpponentUsesHealItem: @ 81D9F4F
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring BATTLE_TEXT_Used2
waitmessage 64
useitemonopponent
@ -128,7 +128,7 @@ BattleScript_OpponentUsesHealItem: @ 81D9F4F
BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring BATTLE_TEXT_Used2
waitmessage 64
useitemonopponent
@ -141,7 +141,7 @@ BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B
BattleScript_OpponentUsesXItem: @ 81D9F9C
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring BATTLE_TEXT_Used2
waitmessage 64
useitemonopponent
@ -153,7 +153,7 @@ BattleScript_OpponentUsesXItem: @ 81D9F9C
BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring BATTLE_TEXT_Used2
waitmessage 64
useitemonopponent
@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB
finishaction
BattleScript_RunByUsingItem: @ 81D9FDA
playse SE_NIGERU
playse SE_FLEE
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn

8
data/event_scripts.s vendored
View File

@ -867,13 +867,13 @@ Common_EventScript_SetLegendaryWeather:: @ 81A02C1
return
Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
waitfanfare
return
Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special ScrSpecial_HealPlayerParty
fadescreen FADE_FROM_BLACK
@ -890,7 +890,7 @@ EventScript_RegionMap:: @ 81A02D6
Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, FALSE
playbgm MUS_SAILING, FALSE
return
Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF
@ -973,7 +973,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 81A0678
Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F
bufferitemname 0, VAR_0x8004
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
message FallarborTown_House1_Text_1A1498
waitmessage
waitfanfare

2
data/maps/AbandonedShip_CaptainsOffice/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
"name": "AbandonedShip_CaptainsOffice",
"layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Corridors_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"name": "AbandonedShip_Corridors_1F",
"layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Corridors_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"name": "AbandonedShip_Corridors_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Deck/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_DECK",
"name": "AbandonedShip_Deck",
"layout": "LAYOUT_ABANDONED_SHIP_DECK",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/AbandonedShip_HiddenFloorCorridors/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"name": "AbandonedShip_HiddenFloorCorridors",
"layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_HiddenFloorRooms/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"name": "AbandonedShip_HiddenFloorRooms",
"layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Room_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOM_B1F",
"name": "AbandonedShip_Room_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Rooms2_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"name": "AbandonedShip_Rooms2_1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Rooms2_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"name": "AbandonedShip_Rooms2_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Rooms_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS_1F",
"name": "AbandonedShip_Rooms_1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Rooms_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"name": "AbandonedShip_Rooms_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

2
data/maps/AbandonedShip_Underwater1/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_UNDERWATER1",
"name": "AbandonedShip_Underwater1",
"layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1",
"music": "MUS_DEEPDEEP",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_BUBBLES",

2
data/maps/AbandonedShip_Underwater2/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_UNDERWATER2",
"name": "AbandonedShip_Underwater2",
"layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2",
"music": "MUS_DEEPDEEP",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_BUBBLES",

2
data/maps/AncientTomb/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ANCIENT_TOMB",
"name": "AncientTomb",
"layout": "LAYOUT_ANCIENT_TOMB",
"music": "MUS_MABOROSI",
"music": "MUS_SEALED_CHAMBER",
"region_map_section": "MAPSEC_ANCIENT_TOMB",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/AquaHideout_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_1F",
"name": "AquaHideout_1F",
"layout": "LAYOUT_AQUA_HIDEOUT_1F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/AquaHideout_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_B1F",
"name": "AquaHideout_B1F",
"layout": "LAYOUT_AQUA_HIDEOUT_B1F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/AquaHideout_B2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_B2F",
"name": "AquaHideout_B2F",
"layout": "LAYOUT_AQUA_HIDEOUT_B2F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattleTower_BattleRoom/scripts.inc vendored
View File

@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
special LoadPlayerParty
special SavePlayerParty
special SetBattleTowerParty
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special ScrSpecial_HealPlayerParty

4
data/maps/BattleTower_Lobby/scripts.inc vendored
View File

@ -82,7 +82,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
goto_if_eq BattleTower_Lobby_EventScript_16037D
message BattleTower_Lobby_Text_19A6BE
waitmessage
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
waitfanfare
msgbox BattleTower_Lobby_Text_19A719, MSGBOX_DEFAULT
@ -112,7 +112,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
case 0, BattleTower_Lobby_EventScript_160408
message BattleTower_Lobby_Text_19A506
waitmessage
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
waitfanfare
setvar VAR_0x8004, 9
special BattleTowerUtil

2
data/maps/CaveOfOrigin_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_1F",
"name": "CaveOfOrigin_1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_1F",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_NONE",

2
data/maps/CaveOfOrigin_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B1F",
"name": "CaveOfOrigin_B1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_NONE",

2
data/maps/CaveOfOrigin_B2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B2F",
"name": "CaveOfOrigin_B2F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B2F",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_FOG_1",

2
data/maps/CaveOfOrigin_B3F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B3F",
"name": "CaveOfOrigin_B3F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B3F",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_FOG_1",

2
data/maps/CaveOfOrigin_B4F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B4F",
"name": "CaveOfOrigin_B4F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B4F",
"music": "SE_STOP",
"music": "MUS_DUMMY",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_FOG_1",

4
data/maps/CaveOfOrigin_B4F/scripts.inc vendored
View File

@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
doweather
special WaitWeather
waitstate
playse SE_W197
playse SE_M_DETECT
setfieldeffectargument 0, 9
setfieldeffectargument 1, 13
setfieldeffectargument 2, 0
@ -46,7 +46,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
.else
setvar VAR_RESULT, 2
.endif
playse SE_TAMA
playse SE_ORB
special sub_80818A4
waitstate
special sub_80818FC

2
data/maps/CaveOfOrigin_Entrance/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
"name": "CaveOfOrigin_Entrance",
"layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DesertRuins/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DESERT_RUINS",
"name": "DesertRuins",
"layout": "LAYOUT_DESERT_RUINS",
"music": "MUS_MABOROSI",
"music": "MUS_SEALED_CHAMBER",
"region_map_section": "MAPSEC_DESERT_RUINS",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DewfordTown/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN",
"name": "DewfordTown",
"layout": "LAYOUT_DEWFORD_TOWN",
"music": "MUS_HIGHTOWN",
"music": "MUS_DEWFORD",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/DewfordTown_Gym/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_GYM",
"name": "DewfordTown_Gym",
"layout": "LAYOUT_DEWFORD_TOWN_GYM",
"music": "MUS_GIM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

8
data/maps/DewfordTown_Gym/scripts.inc vendored
View File

@ -55,25 +55,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5
return
DewfordTown_Gym_EventScript_1530F6:: @ 81530F6
playse SE_MU_PACHI
playse SE_SWITCH
animateflash 3
call DewfordTown_Gym_EventScript_153071
return
DewfordTown_Gym_EventScript_153101:: @ 8153101
playse SE_MU_PACHI
playse SE_SWITCH
animateflash 2
call DewfordTown_Gym_EventScript_153071
return
DewfordTown_Gym_EventScript_15310C:: @ 815310C
playse SE_MU_PACHI
playse SE_SWITCH
animateflash 1
call DewfordTown_Gym_EventScript_153071
return
DewfordTown_Gym_EventScript_153117:: @ 8153117
playse SE_MU_PACHI
playse SE_SWITCH
animateflash 0
call DewfordTown_Gym_EventScript_153071
return

2
data/maps/DewfordTown_Hall/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_HALL",
"name": "DewfordTown_Hall",
"layout": "LAYOUT_DEWFORD_TOWN_HALL",
"music": "MUS_HIGHTOWN",
"music": "MUS_DEWFORD",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DewfordTown_House1/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_HOUSE1",
"name": "DewfordTown_House1",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_HIGHTOWN",
"music": "MUS_DEWFORD",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DewfordTown_House2/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_HOUSE2",
"name": "DewfordTown_House2",
"layout": "LAYOUT_HOUSE4",
"music": "MUS_HIGHTOWN",
"music": "MUS_DEWFORD",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DewfordTown_PokemonCenter_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
"name": "DewfordTown_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DewfordTown_PokemonCenter_2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
"name": "DewfordTown_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/DoubleBattleColosseum/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_DOUBLE_BATTLE_COLOSSEUM",
"name": "DoubleBattleColosseum",
"layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
"music": "MUS_RAINBOW",
"music": "MUS_EVER_GRANDE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY",
"name": "EverGrandeCity",
"layout": "LAYOUT_EVER_GRANDE_CITY",
"music": "MUS_RAINBOW",
"music": "MUS_EVER_GRANDE",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/EverGrandeCity_ChampionsRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"name": "EverGrandeCity_ChampionsRoom",
"layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

6
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc vendored
View File

@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
step_end
EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
playbgm MUS_DAIGO, FALSE
playbgm MUS_ENCOUNTER_CHAMPION, FALSE
msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0
goto EverGrandeCity_ChampionsRoom_EventScript_15B821
@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
end
EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C
playbgm MUS_GIRL_SUP, FALSE
playbgm MUS_ENCOUNTER_MAY, FALSE
return
EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
playbgm MUS_BOY_SUP, FALSE
playbgm MUS_ENCOUNTER_BRENDAN, FALSE
return
EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886

2
data/maps/EverGrandeCity_Corridor1/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CORRIDOR1",
"name": "EverGrandeCity_Corridor1",
"layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_Corridor2/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CORRIDOR2",
"name": "EverGrandeCity_Corridor2",
"layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_Corridor3/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CORRIDOR3",
"name": "EverGrandeCity_Corridor3",
"layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_Corridor4/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CORRIDOR4",
"name": "EverGrandeCity_Corridor4",
"layout": "LAYOUT_EVER_GRANDE_CITY_CORRIDOR4",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_Corridor5/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_CORRIDOR5",
"name": "EverGrandeCity_Corridor5",
"layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_DrakesRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
"name": "EverGrandeCity_DrakesRoom",
"layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_DrakesRoom/scripts.inc vendored
View File

@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
playbgm MUS_SITENNOU, FALSE
playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE
msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42
goto EverGrandeCity_DrakesRoom_EventScript_15B795

2
data/maps/EverGrandeCity_GlaciasRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"name": "EverGrandeCity_GlaciasRoom",
"layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc vendored
View File

@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
playbgm MUS_SITENNOU, FALSE
playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE
msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01
goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB

2
data/maps/EverGrandeCity_HallOfFame/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
"name": "EverGrandeCity_HallOfFame",
"layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
"music": "MUS_EIKOU_R",
"music": "MUS_HALL_OF_FAME_ROOM",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_PhoebesRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"name": "EverGrandeCity_PhoebesRoom",
"layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc vendored
View File

@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
playbgm MUS_SITENNOU, FALSE
playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE
msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C
goto EverGrandeCity_PhoebesRoom_EventScript_15B661

2
data/maps/EverGrandeCity_PokemonCenter_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
"name": "EverGrandeCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_PokemonCenter_2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
"name": "EverGrandeCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_PokemonLeague/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE",
"name": "EverGrandeCity_PokemonLeague",
"layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/EverGrandeCity_PokemonLeague/scripts.inc vendored
View File

@ -61,7 +61,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
waitmovement 0
delay 10
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
message EverGrandeCity_PokemonLeague_Text_191804
waitmessage
waitfanfare
@ -83,7 +83,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
return
EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
playse SE_HAZURE
playse SE_FAILURE
msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT
releaseall
end

2
data/maps/EverGrandeCity_SidneysRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"name": "EverGrandeCity_SidneysRoom",
"layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"music": "MUS_C_ROAD",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_EVER_GRANDE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/EverGrandeCity_SidneysRoom/scripts.inc vendored
View File

@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
playbgm MUS_SITENNOU, FALSE
playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE
msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823
goto EverGrandeCity_SidneysRoom_EventScript_15B5C7

2
data/maps/FallarborTown/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN",
"name": "FallarborTown",
"layout": "LAYOUT_FALLARBOR_TOWN",
"music": "MUS_TONEKUSA",
"music": "MUS_FALLARBOR",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FallarborTown_ContestHall/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_CONTEST_HALL",
"name": "FallarborTown_ContestHall",
"layout": "LAYOUT_CONTEST_HALL",
"music": "MUS_CONLOBBY",
"music": "MUS_CONTEST_LOBBY",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FallarborTown_ContestLobby/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_CONTEST_LOBBY",
"name": "FallarborTown_ContestLobby",
"layout": "LAYOUT_CONTEST_LOBBY",
"music": "MUS_CONLOBBY",
"music": "MUS_CONTEST_LOBBY",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

4
data/maps/FallarborTown_ContestLobby/scripts.inc vendored
View File

@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
lockall
applymovement 1, FallarborTown_ContestLobby_Movement_153A7C
waitmovement 0
playse SE_HASHI
playse SE_BRIDGE_WALK
setmetatile 4, 2, METATILE_Contest_WallShadow, 1
setmetatile 4, 3, METATILE_Contest_FloorShadow, 1
special DrawWholeMapView
applymovement 1, FallarborTown_ContestLobby_Movement_153A7F
waitmovement 0
playse SE_HASHI
playse SE_BRIDGE_WALK
setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1
setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1
special DrawWholeMapView

2
data/maps/FallarborTown_House1/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_HOUSE1",
"name": "FallarborTown_House1",
"layout": "LAYOUT_HOUSE1",
"music": "MUS_TONEKUSA",
"music": "MUS_FALLARBOR",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FallarborTown_House2/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_HOUSE2",
"name": "FallarborTown_House2",
"layout": "LAYOUT_HOUSE2",
"music": "MUS_TONEKUSA",
"music": "MUS_FALLARBOR",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FallarborTown_Mart/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_MART",
"name": "FallarborTown_Mart",
"layout": "LAYOUT_POKE_MART",
"music": "MUS_FRIENDLY",
"music": "MUS_POKE_MART",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FallarborTown_PokemonCenter_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
"name": "FallarborTown_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FallarborTown_PokemonCenter_1F/scripts.inc vendored
View File

@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
end
FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
playse SE_JIDO_DOA
playse SE_SLIDING_DOOR
removeobject 4
clearflag FLAG_HIDE_LANETTE
release

2
data/maps/FallarborTown_PokemonCenter_2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
"name": "FallarborTown_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FALLARBOR_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FieryPath/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FIERY_PATH",
"name": "FieryPath",
"layout": "LAYOUT_FIERY_PATH",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_FIERY_PATH",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY",
"name": "FortreeCity",
"layout": "LAYOUT_FORTREE_CITY",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

2
data/maps/FortreeCity_DecorationShop/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_DECORATION_SHOP",
"name": "FortreeCity_DecorationShop",
"layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_Gym/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_GYM",
"name": "FortreeCity_Gym",
"layout": "LAYOUT_FORTREE_CITY_GYM",
"music": "MUS_GIM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_House1/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_HOUSE1",
"name": "FortreeCity_House1",
"layout": "LAYOUT_FORTREE_CITY_HOUSE1",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_House2/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_HOUSE2",
"name": "FortreeCity_House2",
"layout": "LAYOUT_FORTREE_CITY_HOUSE2",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_House3/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_HOUSE3",
"name": "FortreeCity_House3",
"layout": "LAYOUT_FORTREE_CITY_HOUSE1",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_House4/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_HOUSE4",
"name": "FortreeCity_House4",
"layout": "LAYOUT_FORTREE_CITY_HOUSE2",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_House5/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_HOUSE5",
"name": "FortreeCity_House5",
"layout": "LAYOUT_FORTREE_CITY_HOUSE1",
"music": "MUS_MACHI_S3",
"music": "MUS_FORTREE",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_Mart/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_MART",
"name": "FortreeCity_Mart",
"layout": "LAYOUT_POKE_MART",
"music": "MUS_FRIENDLY",
"music": "MUS_POKE_MART",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_PokemonCenter_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
"name": "FortreeCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/FortreeCity_PokemonCenter_2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
"name": "FortreeCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FORTREE_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/GraniteCave_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_GRANITE_CAVE_1F",
"name": "GraniteCave_1F",
"layout": "LAYOUT_GRANITE_CAVE_1F",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_GRANITE_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/GraniteCave_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_GRANITE_CAVE_B1F",
"name": "GraniteCave_B1F",
"layout": "LAYOUT_GRANITE_CAVE_B1F",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_GRANITE_CAVE",
"requires_flash": true,
"weather": "WEATHER_NONE",

2
data/maps/GraniteCave_B2F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_GRANITE_CAVE_B2F",
"name": "GraniteCave_B2F",
"layout": "LAYOUT_GRANITE_CAVE_B2F",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_GRANITE_CAVE",
"requires_flash": true,
"weather": "WEATHER_NONE",

2
data/maps/GraniteCave_StevensRoom/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_GRANITE_CAVE_STEVENS_ROOM",
"name": "GraniteCave_StevensRoom",
"layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_GRANITE_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/GraniteCave_StevensRoom/scripts.inc vendored
View File

@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
compare VAR_FACING, 4
call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
playse SE_KAIDAN
playse SE_EXIT
removeobject 1
release
end

2
data/maps/InsideOfTruck/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_INSIDE_OF_TRUCK",
"name": "InsideOfTruck",
"layout": "LAYOUT_INSIDE_OF_TRUCK",
"music": "SE_STOP",
"music": "MUS_DUMMY",
"region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/IslandCave/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_ISLAND_CAVE",
"name": "IslandCave",
"layout": "LAYOUT_ISLAND_CAVE",
"music": "MUS_MABOROSI",
"music": "MUS_SEALED_CHAMBER",
"region_map_section": "MAPSEC_ISLAND_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/IslandCave/scripts.inc vendored
View File

@ -37,7 +37,7 @@ S_OpenRegiceChamber:: @ 815EF19
setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0
setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1
special DrawWholeMapView
playse SE_BAN
playse SE_BANG
setflag FLAG_SYS_BRAILLE_WAIT
end

2
data/maps/JaggedPass/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_JAGGED_PASS",
"name": "JaggedPass",
"layout": "LAYOUT_JAGGED_PASS",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_JAGGED_PASS",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/LavaridgeTown/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_LAVARIDGE_TOWN",
"name": "LavaridgeTown",
"layout": "LAYOUT_LAVARIDGE_TOWN",
"music": "MUS_MACHI_S4",
"music": "MUS_OLDALE",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

6
data/maps/LavaridgeTown/scripts.inc vendored
View File

@ -57,11 +57,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
end
LavaridgeTown_EventScript_14E56B:: @ 814E56B
playbgm MUS_GIRL_SUP, TRUE
playbgm MUS_ENCOUNTER_MAY, TRUE
return
LavaridgeTown_EventScript_14E570:: @ 814E570
playbgm MUS_BOY_SUP, TRUE
playbgm MUS_ENCOUNTER_BRENDAN, TRUE
return
LavaridgeTown_EventScript_14E575:: @ 814E575
@ -280,7 +280,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
goto_if_eq LavaridgeTown_EventScript_14E7A8
msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_LAVARIDGE_EGG
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
message LavaridgeTown_Text_16C2EA
waitfanfare
waitmessage

2
data/maps/LavaridgeTown_Gym_1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_LAVARIDGE_TOWN_GYM_1F",
"name": "LavaridgeTown_Gym_1F",
"layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F",
"music": "MUS_GIM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false,
"weather": "WEATHER_FOG_1",

2
data/maps/LavaridgeTown_Gym_B1F/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_LAVARIDGE_TOWN_GYM_B1F",
"name": "LavaridgeTown_Gym_B1F",
"layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F",
"music": "MUS_GIM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false,
"weather": "WEATHER_FOG_1",

2
data/maps/LavaridgeTown_HerbShop/map.json vendored
View File

@ -2,7 +2,7 @@
"id": "MAP_LAVARIDGE_TOWN_HERB_SHOP",
"name": "LavaridgeTown_HerbShop",
"layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
"music": "MUS_MACHI_S4",
"music": "MUS_OLDALE",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false,
"weather": "WEATHER_NONE",

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