diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-09 08:40:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 08:40:14 -0400 |
| commit | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (patch) | |
| tree | d628693647f730f285f68fcd39b03e781a1a37ab | |
| parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) | |
| parent | 40a810679f0fce5c092f9f619025b04dbbf8a214 (diff) | |
Merge pull request #96 from SatoMew/master
Replace labels for used and unused Saffron City maps
36 files changed, 600 insertions, 600 deletions
diff --git a/data/layouts/SaffronCity/map.bin b/data/layouts/SaffronCity/map.bin Binary files differindex dd7aea1cf..001fb4e2f 100644 --- a/data/layouts/SaffronCity/map.bin +++ b/data/layouts/SaffronCity/map.bin diff --git a/data/layouts/SaffronCity_Duplicate/border.bin b/data/layouts/SaffronCity_Classic/border.bin Binary files differindex a701312cf..a701312cf 100644 --- a/data/layouts/SaffronCity_Duplicate/border.bin +++ b/data/layouts/SaffronCity_Classic/border.bin diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Classic/map.bin Binary files differnew file mode 100644 index 000000000..dd7aea1cf --- /dev/null +++ b/data/layouts/SaffronCity_Classic/map.bin diff --git a/data/layouts/SaffronCity_Duplicate/map.bin b/data/layouts/SaffronCity_Duplicate/map.bin Binary files differdeleted file mode 100644 index 001fb4e2f..000000000 --- a/data/layouts/SaffronCity_Duplicate/map.bin +++ /dev/null diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 3675b33c0..2f0942f7e 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -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" } ] -}
\ No newline at end of file +} diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 908d7e543..e45575959 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -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" @@ -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 diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 0c79d7687..3cf8a29dc 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -18,7 +18,7 @@ "direction": "up" }, { - "map": "MAP_SAFFRON_CITY", + "map": "MAP_SAFFRON_CITY_CLASSIC", "offset": 0, "direction": "down" } diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index fe0565acb..488238a2e 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -32,7 +32,7 @@ "x": 3, "y": 9, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 9 }, { @@ -46,7 +46,7 @@ "x": 4, "y": 9, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 9 }, { diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 7a1c9b9f1..8f940ef20 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -13,7 +13,7 @@ "battle_scene": "BATTLE_SCENE_0", "connections": [ { - "map": "MAP_SAFFRON_CITY", + "map": "MAP_SAFFRON_CITY_CLASSIC", "offset": 0, "direction": "up" }, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index e22d5be5d..14bc8d2e4 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -32,14 +32,14 @@ "x": 4, "y": 1, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 11 }, { "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 11 }, { diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 8c889d5c2..01f22d853 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -18,7 +18,7 @@ "direction": "left" }, { - "map": "MAP_SAFFRON_CITY", + "map": "MAP_SAFFRON_CITY_CLASSIC", "offset": -10, "direction": "right" } diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index a2c775f2c..a5c53552a 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -46,14 +46,14 @@ "x": 11, "y": 5, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 8 }, { "x": 11, "y": 6, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 8 } ], diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 6a5534a2c..53f7be9f0 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -13,7 +13,7 @@ "battle_scene": "BATTLE_SCENE_0", "connections": [ { - "map": "MAP_SAFFRON_CITY", + "map": "MAP_SAFFRON_CITY_CLASSIC", "offset": -10, "direction": "left" }, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index d9736b5eb..3a1118032 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -32,14 +32,14 @@ "x": 1, "y": 4, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 10 }, { "x": 1, "y": 5, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 10 }, { diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index f86012a9a..19715bdf9 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -33,8 +33,375 @@ "direction": "right" } ], - "object_events": [], - "warp_events": [], + "connections_no_include": true, + "object_events": [ + { + "graphics_id": "49", + "x": 22, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_16737A", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_167383", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 46, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_16738C", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 27, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_167395", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 25, + "y": 33, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_16739E", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 34, + "y": 31, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673B9", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 30, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673B0", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 48, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673A7", + "flag": "62" + }, + { + "graphics_id": "18", + "x": 37, + "y": 32, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673EC", + "flag": "63" + }, + { + "graphics_id": "47", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673E3", + "flag": "63" + }, + { + "graphics_id": "25", + "x": 39, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_16741A", + "flag": "63" + }, + { + "graphics_id": "19", + "x": 44, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673FE", + "flag": "63" + }, + { + "graphics_id": "114", + "x": 45, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_167407", + "flag": "63" + }, + { + "graphics_id": "22", + "x": 32, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1673F5", + "flag": "63" + }, + { + "graphics_id": "24", + "x": 47, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_EventScript_1AD03A", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 33, + "y": 30, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DOJO", + "dest_warp_id": 1 + }, + { + "x": 46, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 27, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 43, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 34, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 58, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 47, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 0 + } + ], "coord_events": [], - "bg_events": [] + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 14, + "elevation": 0, + "script": "SaffronCity_EventScript_167423" + }, + { + "type": "bg_event_type_0", + "x": 42, + "y": 14, + "elevation": 0, + "script": "SaffronCity_EventScript_16742C" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 25, + "elevation": 0, + "script": "SaffronCity_EventScript_167471" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 30, + "elevation": 0, + "script": "SaffronCity_EventScript_167456" + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 31, + "elevation": 0, + "script": "SaffronCity_EventScript_16745F" + }, + { + "type": "bg_event_type_0", + "x": 54, + "y": 25, + "elevation": 0, + "script": "SaffronCity_EventScript_16744D" + }, + { + "type": "bg_event_type_0", + "x": 50, + "y": 14, + "elevation": 0, + "script": "SaffronCity_EventScript_167435" + }, + { + "type": "bg_event_type_0", + "x": 40, + "y": 38, + "elevation": 0, + "script": "SaffronCity_EventScript_167468" + }, + { + "type": "bg_event_type_0", + "x": 49, + "y": 22, + "elevation": 0, + "script": "SaffronCity_EventScript_16747A" + } + ] } diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 0b3469775..9d591eec0 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,2 +1,128 @@ -SaffronCity_MapScripts:: @ 8167483 +SaffronCity_MapScripts:: @ 816735F + map_script 3, SaffronCity_MapScript1_167365 .byte 0 + +SaffronCity_MapScript1_167365:: @ 8167365 + setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY + checkflag FLAG_0x23C + call_if 0, EventScript_167372 + end + +EventScript_167372:: @ 8167372 + setobjectxyperm 6, 33, 31 + return + +SaffronCity_EventScript_16737A:: @ 816737A + msgbox gUnknown_8181003, 2 + end + +SaffronCity_EventScript_167383:: @ 8167383 + msgbox gUnknown_818101F, 2 + end + +SaffronCity_EventScript_16738C:: @ 816738C + msgbox gUnknown_818105A, 2 + end + +SaffronCity_EventScript_167395:: @ 8167395 + msgbox gUnknown_8181087, 2 + end + +SaffronCity_EventScript_16739E:: @ 816739E + msgbox gUnknown_81810A7, 2 + end + +SaffronCity_EventScript_1673A7:: @ 81673A7 + msgbox gUnknown_81810D5, 2 + end + +SaffronCity_EventScript_1673B0:: @ 81673B0 + msgbox gUnknown_81810F5, 2 + end + +SaffronCity_EventScript_1673B9:: @ 81673B9 + lock + checkflag FLAG_0x23C + goto_if_eq EventScript_1673D7 + applymovement 6, Movement_1A75E1 + waitmovement 0 + msgbox gUnknown_81812CA + release + end + +EventScript_1673D7:: @ 81673D7 + textcolor 3 + msgbox gUnknown_8181302 + release + end + +SaffronCity_EventScript_1673E3:: @ 81673E3 + msgbox gUnknown_8181159, 2 + end + +SaffronCity_EventScript_1673EC:: @ 81673EC + msgbox gUnknown_8181189, 2 + end + +SaffronCity_EventScript_1673F5:: @ 81673F5 + msgbox gUnknown_81811BF, 2 + end + +SaffronCity_EventScript_1673FE:: @ 81673FE + msgbox gUnknown_8181225, 2 + end + +SaffronCity_EventScript_167407:: @ 8167407 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEOT, 0 + msgbox gUnknown_8181286 + waitmoncry + release + end + +SaffronCity_EventScript_16741A:: @ 816741A + msgbox gUnknown_8181299, 2 + end + +SaffronCity_EventScript_167423:: @ 8167423 + msgbox gUnknown_8181326, 3 + end + +SaffronCity_EventScript_16742C:: @ 816742C + msgbox gUnknown_8181354, 3 + end + +SaffronCity_EventScript_167435:: @ 8167435 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + msgbox gUnknown_8181362 + releaseall + end + +SaffronCity_EventScript_16744D:: @ 816744D + msgbox gUnknown_81813AA, 3 + end + +SaffronCity_EventScript_167456:: @ 8167456 + msgbox gUnknown_8181452, 3 + end + +SaffronCity_EventScript_16745F:: @ 816745F + msgbox gUnknown_81814B9, 3 + end + +SaffronCity_EventScript_167468:: @ 8167468 + msgbox gUnknown_81814D3, 3 + end + +SaffronCity_EventScript_167471:: @ 8167471 + msgbox gUnknown_81814E7, 3 + end + +SaffronCity_EventScript_16747A:: @ 816747A + msgbox gUnknown_8181519, 3 + end diff --git a/data/maps/SaffronCity_Duplicate/text.inc b/data/maps/SaffronCity/text.inc index aaa009647..aaa009647 100644 --- a/data/maps/SaffronCity_Duplicate/text.inc +++ b/data/maps/SaffronCity/text.inc diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Classic/map.json new file mode 100644 index 000000000..22eb6ab26 --- /dev/null +++ b/data/maps/SaffronCity_Classic/map.json @@ -0,0 +1,40 @@ +{ + "id": "MAP_SAFFRON_CITY_CLASSIC", + "name": "SaffronCity_Classic", + "layout": "LAYOUT_SAFFRON_CITY_CLASSIC", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE8", + "offset": 10, + "direction": "right" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SaffronCity_Classic/scripts.inc b/data/maps/SaffronCity_Classic/scripts.inc new file mode 100644 index 000000000..26470756d --- /dev/null +++ b/data/maps/SaffronCity_Classic/scripts.inc @@ -0,0 +1,2 @@ +SaffronCity_Classic_MapScripts:: @ 8167483 + .byte 0 diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index a8d80bb8e..b3c1f049c 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -110,21 +110,21 @@ "x": 5, "y": 14, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 2 }, { "x": 6, "y": 14, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 2 }, { "x": 7, "y": 14, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 2 } ], diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json deleted file mode 100644 index 06bcbfd01..000000000 --- a/data/maps/SaffronCity_Duplicate/map.json +++ /dev/null @@ -1,407 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_DUPLICATE", - "name": "SaffronCity_Duplicate", - "layout": "LAYOUT_SAFFRON_CITY_DUPLICATE", - "music": "BGM_FRLG_VIRIDIAN_CITY", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": [ - { - "map": "MAP_ROUTE5", - "offset": 0, - "direction": "up" - }, - { - "map": "MAP_ROUTE6", - "offset": 12, - "direction": "down" - }, - { - "map": "MAP_ROUTE7", - "offset": 10, - "direction": "left" - }, - { - "map": "MAP_ROUTE8", - "offset": 10, - "direction": "right" - } - ], - "connections_no_include": true, - "object_events": [ - { - "graphics_id": "49", - "x": 22, - "y": 15, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_16737A", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 26, - "y": 16, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 4, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_167383", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 46, - "y": 13, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_16738C", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 27, - "y": 22, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_167395", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 25, - "y": 33, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 7, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_16739E", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 34, - "y": 31, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673B9", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 30, - "y": 39, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 5, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673B0", - "flag": "62" - }, - { - "graphics_id": "49", - "x": 48, - "y": 24, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 4, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673A7", - "flag": "62" - }, - { - "graphics_id": "18", - "x": 37, - "y": 32, - "elevation": 3, - "movement_type": "1", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673EC", - "flag": "63" - }, - { - "graphics_id": "47", - "x": 21, - "y": 23, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673E3", - "flag": "63" - }, - { - "graphics_id": "25", - "x": 39, - "y": 16, - "elevation": 3, - "movement_type": "7", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_16741A", - "flag": "63" - }, - { - "graphics_id": "19", - "x": 44, - "y": 22, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673FE", - "flag": "63" - }, - { - "graphics_id": "114", - "x": 45, - "y": 22, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_167407", - "flag": "63" - }, - { - "graphics_id": "22", - "x": 32, - "y": 39, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 5, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1673F5", - "flag": "63" - }, - { - "graphics_id": "24", - "x": 47, - "y": 24, - "elevation": 3, - "movement_type": "5", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Duplicate_EventScript_1AD03A", - "flag": "157" - } - ], - "warp_events": [ - { - "x": 33, - "y": 30, - "elevation": 0, - "dest_map": "MAP_SILPH_CO_1F", - "dest_warp_id": 1 - }, - { - "x": 22, - "y": 14, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", - "dest_warp_id": 1 - }, - { - "x": 40, - "y": 12, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_DOJO", - "dest_warp_id": 1 - }, - { - "x": 46, - "y": 12, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 1 - }, - { - "x": 27, - "y": 21, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE2", - "dest_warp_id": 1 - }, - { - "x": 40, - "y": 21, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_MART", - "dest_warp_id": 1 - }, - { - "x": 24, - "y": 38, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 - }, - { - "x": 43, - "y": 38, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE3", - "dest_warp_id": 1 - }, - { - "x": 8, - "y": 27, - "elevation": 3, - "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", - "dest_warp_id": 2 - }, - { - "x": 34, - "y": 5, - "elevation": 3, - "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 2 - }, - { - "x": 58, - "y": 27, - "elevation": 3, - "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", - "dest_warp_id": 1 - }, - { - "x": 34, - "y": 46, - "elevation": 3, - "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 0 - }, - { - "x": 35, - "y": 46, - "elevation": 3, - "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 0 - }, - { - "x": 35, - "y": 5, - "elevation": 3, - "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 2 - }, - { - "x": 47, - "y": 21, - "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 29, - "y": 14, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_167423" - }, - { - "type": "bg_event_type_0", - "x": 42, - "y": 14, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_16742C" - }, - { - "type": "bg_event_type_0", - "x": 13, - "y": 25, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_167471" - }, - { - "type": "bg_event_type_0", - "x": 18, - "y": 30, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_167456" - }, - { - "type": "bg_event_type_0", - "x": 29, - "y": 31, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_16745F" - }, - { - "type": "bg_event_type_0", - "x": 54, - "y": 25, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_16744D" - }, - { - "type": "bg_event_type_0", - "x": 50, - "y": 14, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_167435" - }, - { - "type": "bg_event_type_0", - "x": 40, - "y": 38, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_167468" - }, - { - "type": "bg_event_type_0", - "x": 49, - "y": 22, - "elevation": 0, - "script": "SaffronCity_Duplicate_EventScript_16747A" - } - ] -} diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc deleted file mode 100644 index b19502c90..000000000 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ /dev/null @@ -1,128 +0,0 @@ -SaffronCity_Duplicate_MapScripts:: @ 816735F - map_script 3, SaffronCity_Duplicate_MapScript1_167365 - .byte 0 - -SaffronCity_Duplicate_MapScript1_167365:: @ 8167365 - setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE - checkflag FLAG_0x23C - call_if 0, EventScript_167372 - end - -EventScript_167372:: @ 8167372 - setobjectxyperm 6, 33, 31 - return - -SaffronCity_Duplicate_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, 2 - end - -SaffronCity_Duplicate_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, 2 - end - -SaffronCity_Duplicate_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, 2 - end - -SaffronCity_Duplicate_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, 2 - end - -SaffronCity_Duplicate_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, 2 - end - -SaffronCity_Duplicate_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, 2 - end - -SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, 2 - end - -SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 - lock - checkflag FLAG_0x23C - goto_if_eq EventScript_1673D7 - applymovement 6, Movement_1A75E1 - waitmovement 0 - msgbox gUnknown_81812CA - release - end - -EventScript_1673D7:: @ 81673D7 - textcolor 3 - msgbox gUnknown_8181302 - release - end - -SaffronCity_Duplicate_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, 2 - end - -SaffronCity_Duplicate_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, 2 - end - -SaffronCity_Duplicate_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, 2 - end - -SaffronCity_Duplicate_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, 2 - end - -SaffronCity_Duplicate_EventScript_167407:: @ 8167407 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEOT, 0 - msgbox gUnknown_8181286 - waitmoncry - release - end - -SaffronCity_Duplicate_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, 2 - end - -SaffronCity_Duplicate_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, 3 - end - -SaffronCity_Duplicate_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, 3 - end - -SaffronCity_Duplicate_EventScript_167435:: @ 8167435 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - msgbox gUnknown_8181362 - releaseall - end - -SaffronCity_Duplicate_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, 3 - end - -SaffronCity_Duplicate_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, 3 - end - -SaffronCity_Duplicate_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, 3 - end - -SaffronCity_Duplicate_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, 3 - end - -SaffronCity_Duplicate_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, 3 - end - -SaffronCity_Duplicate_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, 3 - end diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 8b27fea95..aee6e8b27 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -136,21 +136,21 @@ "x": 13, "y": 23, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 3 }, { "x": 14, "y": 23, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 3 }, { "x": 15, "y": 23, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 3 }, { diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 20fca424a..9e30f1487 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -58,21 +58,21 @@ "x": 3, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 1 }, { "x": 4, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 1 }, { "x": 5, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 1 }, { diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 81cbaddb9..1ae403616 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -71,21 +71,21 @@ "x": 3, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 4 }, { "x": 4, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 4 }, { "x": 5, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 4 } ], diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index be9412971..0158a1b04 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -32,21 +32,21 @@ "x": 3, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 7 }, { "x": 4, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 7 }, { "x": 5, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 7 } ], diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index b2882fff3..911a1d85f 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -58,21 +58,21 @@ "x": 3, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 5 }, { "x": 4, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 5 }, { "x": 5, "y": 7, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 5 } ], diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 2e26f7368..ddfd0e82d 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -97,21 +97,21 @@ "x": 6, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 6 }, { "x": 7, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 6 }, { "x": 8, "y": 8, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 6 }, { diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 875585c68..83d719a54 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -149,7 +149,7 @@ "x": 5, "y": 15, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 14 } ], diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 325cef8b5..5c751aba8 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -32,21 +32,21 @@ "x": 7, "y": 21, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 0 }, { "x": 8, "y": 20, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 0 }, { "x": 9, "y": 20, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_map": "MAP_SAFFRON_CITY", "dest_warp_id": 0 }, { diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 3f4e458ca..3bf3c6982 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -249,8 +249,8 @@ "FuchsiaCity", "CinnabarIsland", "IndigoPlateau_Exterior", - "SaffronCity_Duplicate", "SaffronCity", + "SaffronCity_Classic", "OneIsland", "TwoIsland", "ThreeIsland", @@ -566,8 +566,8 @@ "FuchsiaCity", "CinnabarIsland", "IndigoPlateau_Exterior", - "SaffronCity_Duplicate", "SaffronCity", + "SaffronCity_Classic", "OneIsland", "TwoIsland", "ThreeIsland", @@ -620,4 +620,4 @@ "SevenIsland_SevaultCanyon", "SevenIsland_TanobyRuins" ] -}
\ No newline at end of file +} diff --git a/include/constants/flags.h b/include/constants/flags.h index 7f4655d4e..a992bc365 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -17,7 +17,7 @@ #define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897 #define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898 #define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899 -#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a +#define FLAG_WORLD_MAP_SAFFRON_CITY 0x89a #define FLAG_WORLD_MAP_ONE_ISLAND 0x89b #define FLAG_WORLD_MAP_TWO_ISLAND 0x89c #define FLAG_WORLD_MAP_THREE_ISLAND 0x89d diff --git a/include/constants/layouts.h b/include/constants/layouts.h index b97ef69cb..f4f2a8a29 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -71,7 +71,7 @@ #define LAYOUT_FUCHSIA_CITY 85 #define LAYOUT_CINNABAR_ISLAND 86 #define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87 -#define LAYOUT_SAFFRON_CITY 88 +#define LAYOUT_SAFFRON_CITY_CLASSIC 88 #define LAYOUT_ROUTE1 89 #define LAYOUT_ROUTE2 90 #define LAYOUT_ROUTE3 91 @@ -189,7 +189,7 @@ #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM 205 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM 206 -#define LAYOUT_SAFFRON_CITY_DUPLICATE 207 +#define LAYOUT_SAFFRON_CITY 207 #define LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE 208 #define LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE 209 #define LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE 210 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index d769520ca..44fa03eda 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -206,8 +206,8 @@ #define MAP_FUCHSIA_CITY (7 | (3 << 8)) #define MAP_CINNABAR_ISLAND (8 | (3 << 8)) #define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8)) -#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8)) -#define MAP_SAFFRON_CITY (11 | (3 << 8)) +#define MAP_SAFFRON_CITY (10 | (3 << 8)) +#define MAP_SAFFRON_CITY_CLASSIC (11 | (3 << 8)) #define MAP_ONE_ISLAND (12 | (3 << 8)) #define MAP_TWO_ISLAND (13 | (3 << 8)) #define MAP_THREE_ISLAND (14 | (3 << 8)) diff --git a/src/credits.c b/src/credits.c index f47cc79c4..270a4d045 100644 --- a/src/credits.c +++ b/src/credits.c @@ -130,7 +130,7 @@ enum CreditsMap CREDITS_MAP_VERMILION_CITY, CREDITS_MAP_ROUTE10, CREDITS_MAP_CELADON_CITY, - CREDITS_MAP_SAFFRON_CITY_DUPLICATE, + CREDITS_MAP_SAFFRON_CITY, CREDITS_MAP_ROUTE17, CREDITS_MAP_FUCHSIA_CITY, CREDITS_MAP_CINNABAR_ISLAND, @@ -412,7 +412,7 @@ static const struct CreditsScrcmd sCreditsScript[] = { CREDITS_PRINT(BRAILLE_CODE_CHECK, 221), CREDITS_PRINT(INFORMATION_SUPERVISORS, 221), CREDITS_PRINT(DUMMY, 51), - CREDITS_MAPNEXT(SAFFRON_CITY_DUPLICATE, 16), + CREDITS_MAPNEXT(SAFFRON_CITY, 16), CREDITS_PRINT(COORDINATORS, 211), CREDITS_PRINT(TASK_MANAGERS, 210), CREDITS_PRINT(PRODUCERS, 210), @@ -619,7 +619,7 @@ static const struct CreditsOverworldCmd sOverworldCmd_CeladonCity[] = { }; static const struct CreditsOverworldCmd sOverworldCmd_SaffronCity[] = { - { 0x00fe, MAP_GROUP(SAFFRON_CITY_DUPLICATE), MAP_NUM(SAFFRON_CITY_DUPLICATE) }, + { 0x00fe, MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY) }, { 0x0027, 0x0005, 0x0001 }, { 0x0000, 0x0001, 0x0500 }, // Scroll down { 0x00fd, 0x00fd, 0x00fd } diff --git a/src/heal_location.c b/src/heal_location.c index 9756f0951..5c6dbc882 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -19,7 +19,7 @@ static const struct HealLocation sSpawnPoints[] = { [SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY), 0x19, 0x20}, [SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND), 0x0e, 0x0c}, [SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), 0x0b, 0x07}, - [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY_DUPLICATE), MAP_NUM(SAFFRON_CITY_DUPLICATE), 0x18, 0x27}, + [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY), 0x18, 0x27}, [SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4), 0x0c, 0x06}, [SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10), 0x0d, 0x15}, [SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND), MAP_NUM(ONE_ISLAND), 0x0e, 0x06}, |