dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-10 08:34:28 +08:00
parent 7b28a3ecfd c61603fb38
commit 89a377cdd3
582 changed files with 2932 additions and 4066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
+1 -35
View File
@@ -6,41 +6,7 @@
.section .rodata
.align 2, 0
gUnknown_8234614::
.string "$"
gUnknown_8234615::
.string "\n$"
.align 2, 0
gUnknown_8234618:: @ 8234618
.incbin "baserom.gba", 0x234618, 0x8
gUnknown_8234620:: @ 8234620
.incbin "baserom.gba", 0x234620, 0x18
gUnknown_8234638:: @ 8234638
.incbin "baserom.gba", 0x234638, 0x10
gUnknown_8234648:: @ 8234648
.incbin "baserom.gba", 0x234648, 0x20
gUnknown_8234668:: @ 8234668
.incbin "baserom.gba", 0x234668, 0x20
gUnknown_8234688:: @ 8234688
.incbin "baserom.gba", 0x234688, 0x3
gUnknown_823468B:: @ 823468B
.incbin "baserom.gba", 0x23468B, 0x5
gUnknown_8234690:: @ 8234690
.incbin "baserom.gba", 0x234690, 0x4
gUnknown_8234694:: @ 8234694
.incbin "baserom.gba", 0x234694, 0x4
.align 2
gUnknown_8234698:: @ 8234698
.incbin "baserom.gba", 0x234698, 0x20
data/layouts/SaffronCity/map.bin
BIN
View File
Binary file not shown.
data/layouts/SaffronCity_Duplicate/border.bin → data/layouts/SaffronCity_Classic/border.bin
View File
data/layouts/SaffronCity_Classic/map.bin
BIN
View File
Binary file not shown.
data/layouts/SaffronCity_Duplicate/map.bin
BIN
View File
Binary file not shown.
data/layouts/layouts.json
+9 -9
View File
@@ -859,16 +859,16 @@
"blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY",
"name": "SaffronCity_Layout",
"id": "LAYOUT_SAFFRON_CITY_CLASSIC",
"name": "SaffronCity_Classic_Layout",
"width": 48,
"height": 40,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4B9C",
"border_filepath": "data/layouts/SaffronCity/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity/map.bin"
"border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
},
{
"id": "LAYOUT_ROUTE1",
@@ -2276,16 +2276,16 @@
"blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_DUPLICATE",
"name": "SaffronCity_Duplicate_Layout",
"id": "LAYOUT_SAFFRON_CITY",
"name": "SaffronCity_Layout",
"width": 66,
"height": 55,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4B9C",
"border_filepath": "data/layouts/SaffronCity_Duplicate/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_Duplicate/map.bin"
"border_filepath": "data/layouts/SaffronCity/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE",
@@ -4400,4 +4400,4 @@
"blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
}
]
}
}
data/main_menu/unk_8234648.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 148 255
255 255 255
49 57 82
90 98 115
8 8 16
148 156 172
205 222 238
180 180 189
189 205 222
32 32 49
123 131 139
49 82 123
41 123 197
57 139 213
90 164 230
139 197 246
data/main_menu/unk_8234668.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
255 255 255
98 98 98
213 213 205
0 0 0
0 0 0
0 0 0
data/map_event_scripts.inc
+5 -5
View File
@@ -196,8 +196,8 @@
.include "data/maps/FuchsiaCity/scripts.inc"
.include "data/maps/CinnabarIsland/scripts.inc"
.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
.include "data/maps/SaffronCity_Duplicate/scripts.inc"
.include "data/maps/SaffronCity/scripts.inc"
.include "data/maps/SaffronCity_Classic/scripts.inc"
.include "data/maps/OneIsland/scripts.inc"
.include "data/maps/TwoIsland/scripts.inc"
.include "data/maps/ThreeIsland/scripts.inc"
@@ -529,7 +529,7 @@
.include "data/maps/CeladonCity/text.inc"
.include "data/maps/FuchsiaCity/text.inc"
.include "data/maps/CinnabarIsland/text.inc"
.include "data/maps/SaffronCity_Duplicate/text.inc"
.include "data/maps/SaffronCity/text.inc"
.include "data/maps/OneIsland/text.inc"
.include "data/maps/TwoIsland/text.inc"
.include "data/maps/ThreeIsland/text.inc"
@@ -745,7 +745,7 @@ gStdScript_ItemMessageAndFanfare:: @ 81A4E66
textcolor 3
compare_var_to_value VAR_0x8002, MUS_FANFA1
call_if 1, EventScript_1A4EA2
compare_var_to_value VAR_0x8002, BGM_FRLG_ME_KEYITEM
compare_var_to_value VAR_0x8002, MUS_FAN5
call_if 1, EventScript_1A4EA6
message 0x0
waitmessage
@@ -763,7 +763,7 @@ EventScript_1A4EA2:: @ 81A4EA2
return
EventScript_1A4EA6:: @ 81A4EA6
playfanfare BGM_FRLG_ME_KEYITEM
playfanfare MUS_FAN5
return
EventScript_1A4EAA:: @ 81A4EAA
@@ -3329,7 +3329,7 @@ SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
.incbin "baserom.gba", 0x1ACFEF, 0x4B
SaffronCity_Duplicate_EventScript_1AD03A:: @ 81AD03A
SaffronCity_EventScript_1AD03A:: @ 81AD03A
.incbin "baserom.gba", 0x1AD03A, 0x19
CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -78,7 +78,7 @@ EventScript_1652C0:: @ 81652C0
setfieldeffectarg 1, 56
setfieldeffectarg 2, 2
dofieldeffect 68
playbgm BGM_FRLG_DEOXYS_EYE, 0
playbgm MUS_DEOEYE, 0
waitfieldeffect 68
applymovement 2, Movement_165353
waitmovement 0
data/maps/CeladonCity/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY",
"name": "CeladonCity",
"layout": "LAYOUT_CELADON_CITY",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/CeladonCity_Condominiums_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
"name": "CeladonCity_Condominiums_1F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
"name": "CeladonCity_Condominiums_2F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_3F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
"name": "CeladonCity_Condominiums_3F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_Roof/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
"name": "CeladonCity_Condominiums_Roof",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+1 -1
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": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_1F/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_2F/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_3F/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_4F/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_5F/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Elevator/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Roof/map.json
+1 -1
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": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+1 -1
View File
@@ -274,7 +274,7 @@ EventScript_16C0CB:: @ 816C0CB
call_if 1, EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, VAR_0x4000
playse SE_C_PASI
playse SE_JIHANKI
msgbox gUnknown_8196076
additem VAR_0x4000, 1
goto EventScript_16C125
data/maps/CeladonCity_GameCorner/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GAME_CORNER",
"name": "CeladonCity_GameCorner",
"layout": "LAYOUT_CELADON_CITY_GAME_CORNER",
"music": "BGM_FRLG_GAMECORNER",
"music": "MUS_SLOT",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_GameCorner/scripts.inc
+5 -5
View File
@@ -74,7 +74,7 @@ EventScript_16C734:: @ 816C734
EventScript_16C762:: @ 816C762
updatemoneybox 0, 0, 0
updatecoinsbox 0, 5
playse SE_CASHIER
playse SE_SHOP
msgbox gUnknown_8196A62
goto EventScript_16C77A
end
@@ -142,7 +142,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
givecoins 10
textcolor 3
msgbox gUnknown_8196B0D
playse SE_CASHIER
playse SE_SHOP
waitse
setflag FLAG_0x26E
goto EventScript_16C7CA
@@ -206,7 +206,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
givecoins 20
textcolor 3
msgbox gUnknown_8196D47
playse SE_CASHIER
playse SE_SHOP
waitse
setflag FLAG_0x26F
goto EventScript_16C7CA
@@ -236,7 +236,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
givecoins 20
textcolor 3
msgbox gUnknown_8196DF8
playse SE_CASHIER
playse SE_SHOP
waitse
setflag FLAG_0x270
goto EventScript_16C7CA
@@ -418,7 +418,7 @@ CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
end
EventScript_16CABE:: @ 816CABE
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
setmetatile 15, 2, 669, 0
setmetatile 16, 2, 670, 1
setmetatile 17, 2, 671, 1
data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+1 -1
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": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Gym/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GYM",
"name": "CeladonCity_Gym",
"layout": "LAYOUT_CELADON_CITY_GYM",
"music": "BGM_FRLG_GYM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Gym/text.inc
+1 -1
View File
@@ -24,7 +24,7 @@ Text_197114:: @ 8197114
.string "…Oh, I'm sorry, I had no idea that\n"
.string "you wished to challenge me.\p"
.string "Very well, but I shall not lose.{PLAY_BGM BGM_FRLG_LEADER_EYE}$"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$"
Text_197260:: @ 8197260
.string "Oh!\n"
data/maps/CeladonCity_Hotel/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOTEL",
"name": "CeladonCity_Hotel",
"layout": "LAYOUT_CELADON_CITY_HOTEL",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOUSE1",
"name": "CeladonCity_House1",
"layout": "LAYOUT_HOUSE5",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
"name": "CeladonCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
"name": "CeladonCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Restaurant/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_RESTAURANT",
"name": "CeladonCity_Restaurant",
"layout": "LAYOUT_CELADON_CITY_RESTAURANT",
"music": "BGM_FRLG_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_1F",
"name": "CeruleanCave_1F",
"layout": "LAYOUT_CERULEAN_CAVE_1F",
"music": "BGM_FRLG_ROCKET_HIDEOUT",
"music": "MUS_AJITO",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_2F",
"name": "CeruleanCave_2F",
"layout": "LAYOUT_CERULEAN_CAVE_2F",
"music": "BGM_FRLG_ROCKET_HIDEOUT",
"music": "MUS_AJITO",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_B1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_B1F",
"name": "CeruleanCave_B1F",
"layout": "LAYOUT_CERULEAN_CAVE_B1F",
"music": "BGM_FRLG_ROCKET_HIDEOUT",
"music": "MUS_AJITO",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitmessage
waitmoncry
delay 20
playbgm BGM_FRLG_LEADER_EYE, 0
playbgm MUS_EXEYE, 0
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_0x807
data/maps/CeruleanCity/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY",
"name": "CeruleanCity",
"layout": "LAYOUT_CERULEAN_CITY",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/CeruleanCity/scripts.inc
+3 -3
View File
@@ -37,7 +37,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9
EventScript_1664CC:: @ 81664CC
textcolor 0
setvar VAR_0x4054, 2
playbgm BGM_FRLG_RIVAL, 0
playbgm MUS_RIVAL1, 0
addobject 8
applymovement 8, Movement_1665D3
waitmovement 0
@@ -54,7 +54,7 @@ EventScript_1664CC:: @ 81664CC
special SetFlavorTextFlagFromSpecialVars
msgbox gUnknown_817EB95
closemessage
playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_1665A3
compare_var_to_value VAR_0x4001, 1
@@ -177,7 +177,7 @@ CeruleanCity_EventScript_166603:: @ 8166603
goto_if_eq EventScript_16662E
message Text_17EE0E
waitmessage
playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle 3, 355, 0, Text_17EE70
setvar VAR_0x407D, 1
data/maps/CeruleanCity/text.inc
+1 -1
View File
@@ -52,7 +52,7 @@ Text_17EE0E:: @ 817EE0E
.string "…Huh?\n"
.string "Me?\p"
.string "I'm an innocent bystander!\n"
.string "Don't you believe me?{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$"
.string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$"
Text_17EE70:: @ 817EE70
.string "GRUNT: Stop! I give up!\n"
data/maps/CeruleanCity_BikeShop/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_BIKE_SHOP",
"name": "CeruleanCity_BikeShop",
"layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_BikeShop/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ EventScript_16AC15:: @ 816AC15
EventScript_16AC22:: @ 816AC22
msgbox gUnknown_81927B2
giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM
giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
setflag FLAG_0x271
additem ITEM_BICYCLE, 1
removeitem ITEM_BIKE_VOUCHER, 1
data/maps/CeruleanCity_Gym/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_GYM",
"name": "CeruleanCity_Gym",
"layout": "LAYOUT_CERULEAN_CITY_GYM",
"music": "BGM_FRLG_GYM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_Gym/text.inc
+1 -1
View File
@@ -5,7 +5,7 @@ Text_1921EF:: @ 81921EF
.string "What is your approach when you\n"
.string "catch and train POKéMON?\p"
.string "My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$"
gUnknown_81922BF:: @ 81922BF
.string "TM03 teaches WATER PULSE.\p"
data/maps/CeruleanCity_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE1",
"name": "CeruleanCity_House1",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE1",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE2",
"name": "CeruleanCity_House2",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE2",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House3/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE3",
"name": "CeruleanCity_House3",
"layout": "LAYOUT_HOUSE1",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House4/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE4",
"name": "CeruleanCity_House4",
"layout": "LAYOUT_HOUSE1",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House5/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE5",
"name": "CeruleanCity_House5",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE5",
"music": "BGM_FRLG_CERULEAN_CITY",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_Mart/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_MART",
"name": "CeruleanCity_Mart",
"layout": "LAYOUT_MART",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
"name": "CeruleanCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
"name": "CeruleanCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND",
"name": "CinnabarIsland",
"layout": "LAYOUT_CINNABAR_ISLAND",
"music": "BGM_FRLG_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/CinnabarIsland/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
end
EventScript_166F0B:: @ 8166F0B
savebgm BGM_FRLG_FOLLOW_ME
savebgm MUS_ANNAI
setflag FLAG_0x002
setobjectxyperm 3, 15, 12
setobjectmovementtype 3, 9
data/maps/CinnabarIsland_Gym/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_GYM",
"name": "CinnabarIsland_Gym",
"layout": "LAYOUT_CINNABAR_ISLAND_GYM",
"music": "BGM_FRLG_GYM",
"music": "MUS_GYM",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_Gym/scripts.inc
+6 -6
View File
@@ -263,7 +263,7 @@ EventScript_16DC43:: @ 816DC43
end
EventScript_16DC58:: @ 816DC58
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E117
special DrawWholeMapView
@@ -346,7 +346,7 @@ EventScript_16DD1C:: @ 816DD1C
end
EventScript_16DD31:: @ 816DD31
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E157
special DrawWholeMapView
@@ -434,7 +434,7 @@ EventScript_16DDFA:: @ 816DDFA
end
EventScript_16DE0F:: @ 816DE0F
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E197
special DrawWholeMapView
@@ -513,7 +513,7 @@ EventScript_16DED1:: @ 816DED1
end
EventScript_16DEE6:: @ 816DEE6
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E1D7
special DrawWholeMapView
@@ -592,7 +592,7 @@ EventScript_16DFA8:: @ 816DFA8
end
EventScript_16DFBD:: @ 816DFBD
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E1F3
special DrawWholeMapView
@@ -671,7 +671,7 @@ EventScript_16E07F:: @ 816E07F
end
EventScript_16E094:: @ 816E094
playse SE_FU_ZAKU2
playse SE_KI_GASYAN
waitse
call EventScript_16E233
special DrawWholeMapView
data/maps/CinnabarIsland_Gym/text.inc
+1 -1
View File
@@ -6,7 +6,7 @@ Text_199543:: @ 8199543
.string "and ready with intense heat!\p"
.string "They incinerate all challengers!\p"
.string "Hah!\n"
.string "You better have BURN HEAL!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$"
Text_1995FA:: @ 81995FA
.string "I have burned down to nothing!\n"
data/maps/CinnabarIsland_Mart/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_MART",
"name": "CinnabarIsland_Mart",
"layout": "LAYOUT_MART",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
"name": "CinnabarIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
goto_if_eq EventScript_16E9A5
msgbox gUnknown_819A785
closemessage
playbgm BGM_FRLG_FOLLOW_ME, 1
savebgm BGM_FRLG_FOLLOW_ME
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_0x0A2
delay 20
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
"name": "CinnabarIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+1 -1
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": "BGM_FRLG_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+1 -1
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": "BGM_FRLG_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+1 -1
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": "BGM_FRLG_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+1 -1
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": "BGM_FRLG_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_B1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_B1F",
"name": "DiglettsCave_B1F",
"layout": "LAYOUT_DIGLETTS_CAVE_B1F",
"music": "BGM_FRLG_VIRIDIAN_FOREST",
"music": "MUS_T_MORI",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_NorthEntrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
"name": "DiglettsCave_NorthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE",
"music": "BGM_FRLG_VIRIDIAN_FOREST",
"music": "MUS_T_MORI",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_SouthEntrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"name": "DiglettsCave_SouthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"music": "BGM_FRLG_VIRIDIAN_FOREST",
"music": "MUS_T_MORI",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND",
"name": "FiveIsland",
"layout": "LAYOUT_FIVE_ISLAND",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_Harbor/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HARBOR",
"name": "FiveIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE1",
"name": "FiveIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_House2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE2",
"name": "FiveIsland_House2",
"layout": "LAYOUT_HOUSE3",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_LostCave_Entrance/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_LostCave_Room1/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room10/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room11/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room12/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room13/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room14/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room2/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room3/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room4/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room5/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room6/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room7/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room8/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room9/map.json
+1 -1
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": "BGM_FRLG_MT_EMBER",
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_Meadow/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEADOW",
"name": "FiveIsland_Meadow",
"layout": "LAYOUT_FIVE_ISLAND_MEADOW",
"music": "BGM_FRLG_SEVII_ISLANDS",
"music": "MUS_NANASHIMA",
"region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_MemorialPillar/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR",
"name": "FiveIsland_MemorialPillar",
"layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR",
"music": "BGM_FRLG_SEVII_ISLANDS",
"music": "MUS_NANASHIMA",
"region_map_section": "MAPSEC_MEMORIAL_PILLAR",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
"name": "FiveIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
"name": "FiveIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "BGM_FRLG_POKEMON_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_ResortGorgeous/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
"name": "FiveIsland_ResortGorgeous",
"layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
"music": "BGM_FRLG_SEVII_ISLANDS",
"music": "MUS_NANASHIMA",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_ResortGorgeous_House/map.json
+1 -1
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": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_RocketWarehouse/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
"name": "FiveIsland_RocketWarehouse",
"layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE",
"music": "BGM_FRLG_ROCKET_HIDEOUT",
"music": "MUS_AJITO",
"region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_WaterLabyrinth/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
"name": "FiveIsland_WaterLabyrinth",
"layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH",
"music": "BGM_FRLG_SEVII_ISLANDS",
"music": "MUS_NANASHIMA",
"region_map_section": "MAPSEC_WATER_LABYRINTH",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FourIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND",
"name": "FourIsland",
"layout": "LAYOUT_FOUR_ISLAND",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ EventScript_167CEC:: @ 8167CEC
textcolor 0
applymovement 10, Movement_1A75ED
waitmovement 0
playbgm BGM_FRLG_RIVAL, 0
playbgm MUS_RIVAL1, 0
applymovement 10, Movement_1A75DB
waitmovement 0
applymovement 10, Movement_1A75DD
data/maps/FourIsland_Harbor/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HARBOR",
"name": "FourIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FourIsland_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HOUSE1",
"name": "FourIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "BGM_FRLG_ISLAND_FOUR",
"music": "MUS_NANA45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",

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