summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoMew <SatoMew@users.noreply.github.com>2019-08-26 21:14:44 +0100
committerSatoMew <SatoMew@users.noreply.github.com>2019-08-26 21:14:44 +0100
commit78558b07b0983b6b8b06085933fdf66b801658e9 (patch)
treec3f78a86d0c744a65eb4666d5d097066b2401156
parent8c44c7b9494ea503887832b1fdf3a9902c5abbda (diff)
Delete leftovers
-rw-r--r--data/layouts/SaffronCity_Duplicate/border.binbin8 -> 0 bytes
-rw-r--r--data/layouts/SaffronCity_Duplicate/map.binbin7260 -> 0 bytes
-rw-r--r--data/maps/SaffronCity_Duplicate/map.json407
-rw-r--r--data/maps/SaffronCity_Duplicate/scripts.inc128
-rw-r--r--data/maps/SaffronCity_Duplicate/text.inc106
5 files changed, 0 insertions, 641 deletions
diff --git a/data/layouts/SaffronCity_Duplicate/border.bin b/data/layouts/SaffronCity_Duplicate/border.bin
deleted file mode 100644
index a701312cf..000000000
--- a/data/layouts/SaffronCity_Duplicate/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/layouts/SaffronCity_Duplicate/map.bin b/data/layouts/SaffronCity_Duplicate/map.bin
deleted file mode 100644
index 001fb4e2f..000000000
--- a/data/layouts/SaffronCity_Duplicate/map.bin
+++ /dev/null
Binary files differ
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_Duplicate/text.inc b/data/maps/SaffronCity_Duplicate/text.inc
deleted file mode 100644
index aaa009647..000000000
--- a/data/maps/SaffronCity_Duplicate/text.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-gUnknown_8181003:: @ 8181003
- .string "What do you want?\n"
- .string "Get lost!$"
-
-gUnknown_818101F:: @ 818101F
- .string "BOSS said he'll take this town\n"
- .string "in the name of TEAM ROCKET!$"
-
-gUnknown_818105A:: @ 818105A
- .string "Don't get defiant!\n"
- .string "Or I'll have to hurt you!$"
-
-gUnknown_8181087:: @ 8181087
- .string "SAFFRON belongs to TEAM ROCKET!$"
-
-gUnknown_81810A7:: @ 81810A7
- .string "My life as a criminal makes me feel\n"
- .string "so alive!$"
-
-gUnknown_81810D5:: @ 81810D5
- .string "Ow!\n"
- .string "Watch where you're walking!$"
-
-gUnknown_81810F5:: @ 81810F5
- .string "With SILPH under control, we can\n"
- .string "exploit POKéMON around the world!\p"
- .string "We'll get stinking rich, yeahah!$"
-
-gUnknown_8181159:: @ 8181159
- .string "You beat TEAM ROCKET all alone?\n"
- .string "That's amazing!$"
-
-gUnknown_8181189:: @ 8181189
- .string "Yeah! TEAM ROCKET is gone!\n"
- .string "It's safe to go out again!$"
-
-gUnknown_81811BF:: @ 81811BF
- .string "People fled from here in droves\n"
- .string "when those ROCKETS came.\p"
- .string "They should be flocking back to\n"
- .string "SAFFRON now.$"
-
-gUnknown_8181225:: @ 8181225
- .string "I flew here on my PIDGEOT when\n"
- .string "I read about SILPH.\p"
- .string "It's already over?\n"
- .string "I missed the media action…$"
-
-gUnknown_8181286:: @ 8181286
- .string "PIDGEOT: Bi bibii!$"
-
-gUnknown_8181299:: @ 8181299
- .string "I saw the ROCKET BOSS escaping\n"
- .string "SILPH's building.$"
-
-gUnknown_81812CA:: @ 81812CA
- .string "I'm a security guard.\p"
- .string "Suspicious kids I don't allow in!$"
-
-gUnknown_8181302:: @ 8181302
- .string "…\n"
- .string "Snore…\p"
- .string "Hah! He's taking a snooze!$"
-
-gUnknown_8181326:: @ 8181326
- .string "SAFFRON CITY\n"
- .string "Shining, Golden Land of Commerce$"
-
-gUnknown_8181354:: @ 8181354
- .string "FIGHTING DOJO$"
-
-gUnknown_8181362:: @ 8181362
- .string "SAFFRON CITY POKéMON GYM\n"
- .string "LEADER: SABRINA\l"
- .string "The Master of PSYCHIC POKéMON!$"
-
-gUnknown_81813AA:: @ 81813AA
- .string "TRAINER TIPS\p"
- .string "FULL HEAL cures all ailments like\n"
- .string "burns, paralysis, poisoning,\l"
- .string "freezing, and sleep.\p"
- .string "It costs a bit more, but it's more\n"
- .string "convenient than buying other items.$"
-
-gUnknown_8181452:: @ 8181452
- .string "TRAINER TIPS\p"
- .string "The new GREAT BALL offers improved\n"
- .string "catching rates.\p"
- .string "Try it on those hard-to-catch\n"
- .string "POKéMON.$"
-
-gUnknown_81814B9:: @ 81814B9
- .string "SILPH CO. OFFICE BUILDING$"
-
-gUnknown_81814D3:: @ 81814D3
- .string "MR. PSYCHIC'S HOUSE$"
-
-gUnknown_81814E7:: @ 81814E7
- .string "SILPH's latest product!\n"
- .string "Release to be determined…$"
-
-gUnknown_8181519:: @ 8181519
- .string "POKéMON TRAINER FAN CLUB\p"
- .string "Many TRAINERS have scribbled their\n"
- .string "names on this sign.$"
-